-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00.git20131218/util/grub-mkconfig.in
---- grub-2.00.git20131218.orig/util/grub-mkconfig.in 2013-12-18 14:24:56.000000000 +0100
-+++ grub-2.00.git20131218/util/grub-mkconfig.in 2013-12-18 14:31:16.000000000 +0100
-@@ -259,11 +259,16 @@
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub-mkconfig.in grub-2.02~beta2/util/grub-mkconfig.in
+--- grub-2.02~beta2.orig/util/grub-mkconfig.in 2014-01-04 11:34:32.715240491 +0100
++++ grub-2.02~beta2/util/grub-mkconfig.in 2014-01-04 11:34:50.135240649 +0100
+@@ -250,11 +250,16 @@
if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new"
oldumask=$(umask); umask 077
cat << EOF
#
-@@ -325,13 +330,16 @@
+@@ -286,7 +291,7 @@
gettext_printf "Syntax errors are detected in generated GRUB config file.
Ensure that there are no errors in /etc/sysconfig/grub
and /etc/grub.d/* files or please file a bug report with
-%s file attached." "${grub_cfg}.new" >&2
-- echo >&2
+%s file attached." "${grub_cfg}.new" >&3
-+ echo >&3
+ echo >&2
+ exit 1
else
- # none of the children aborted with error, install the new grub.cfg
- mv -f ${grub_cfg}.new ${grub_cfg}
+@@ -295,5 +300,8 @@
fi
fi
+
+# close diagnostic stream
+exec 3>&-
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/00_header.in grub-2.00.git20131218/util/grub.d/00_header.in
---- grub-2.00.git20131218.orig/util/grub.d/00_header.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/00_header.in 2013-12-18 14:29:45.000000000 +0100
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/00_header.in grub-2.02~beta2/util/grub.d/00_header.in
+--- grub-2.02~beta2.orig/util/grub.d/00_header.in 2014-01-04 10:50:51.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/00_header.in 2014-01-04 11:34:50.135240649 +0100
@@ -229,7 +229,7 @@
if [ "x$gfxterm" = x1 ]; then
if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
esac
prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
cat << EOF
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_hurd.in grub-2.00.git20131218/util/grub.d/10_hurd.in
---- grub-2.00.git20131218.orig/util/grub.d/10_hurd.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_hurd.in 2013-12-18 14:32:14.000000000 +0100
-@@ -55,8 +55,8 @@
- basename=`basename "$i"`
- dirname=`dirname "$i"`
- rel_dirname=`make_system_path_relative_to_its_root "$dirname"`
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_hurd.in grub-2.02~beta2/util/grub.d/10_hurd.in
+--- grub-2.02~beta2.orig/util/grub.d/10_hurd.in 2013-12-17 18:25:57.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_hurd.in 2014-01-04 11:35:59.171907965 +0100
+@@ -45,8 +45,8 @@
+ basename=`basename $i`
+ dirname=`dirname $i`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
- gettext_printf "Found GNU Mach: %s" "$i" >&2
- echo >&2
+ gettext_printf "Found GNU Mach: %s" "$i" >&3
kernels="${kernels} ${rel_dirname}/${basename}"
at_least_one=true
fi
-@@ -70,8 +70,8 @@
+@@ -60,8 +60,8 @@
- for i in "$GRUB_ROOT"/hurd/${hurd_fs}.static "$GRUB_ROOT"/hurd/exec ; do
- if test -f "$i" ; then
+ for i in /hurd/${hurd_fs}.static /hurd/exec ; do
+ if test -e "$i" ; then
- gettext_printf "Found Hurd module: %s" "$i" >&2
- echo >&2
+ gettext_printf "Found Hurd module: %s" "$i" >&3
at_least_one=true
else
all_of_them=false
-@@ -84,8 +84,8 @@
+@@ -74,8 +74,8 @@
fi
- if ${all_of_them} && test -f "$GRUB_ROOT"/lib/ld.so.1 ; then : ; else
+ if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
- gettext "Some Hurd stuff found, but not enough to boot." >&2
- echo >&2
+ gettext "Some Hurd stuff found, but not enough to boot." >&3
exit 1
fi
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_kfreebsd.in grub-2.00.git20131218/util/grub.d/10_kfreebsd.in
---- grub-2.00.git20131218.orig/util/grub.d/10_kfreebsd.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_kfreebsd.in 2013-12-18 14:29:45.000000000 +0100
-@@ -168,7 +168,7 @@
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in grub-2.02~beta2/util/grub.d/10_kfreebsd.in
+--- grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in 2013-12-17 18:25:57.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_kfreebsd.in 2014-01-04 11:34:50.135240649 +0100
+@@ -158,7 +158,7 @@
while [ "x$list" != "x" ] ; do
kfreebsd=`version_find_latest $list`
basename=`basename $kfreebsd`
dirname=`dirname $kfreebsd`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -217,7 +217,7 @@
+@@ -207,7 +207,7 @@
fi
done
if test -n "${module_dir}" ; then
module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
fi
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2.00.git20131218/util/grub.d/10_linux.in
---- grub-2.00.git20131218.orig/util/grub.d/10_linux.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_linux.in 2013-12-18 14:29:45.000000000 +0100
-@@ -189,7 +189,7 @@
+--- grub-2.04/util/grub.d/10_linux.in.orig 2018-11-24 18:13:02.000000000 +0100
++++ grub-2.04/util/grub.d/10_linux.in 2019-07-05 13:53:33.737370014 +0200
+@@ -194,7 +194,7 @@
is_top_level=true
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -226,7 +226,7 @@
+@@ -233,7 +233,7 @@
+ for i in ${initrd}; do
+ initrd_display="${initrd_display} ${dirname}/${i}"
+ done
+- gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
++ gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&3
fi
- if test -n "${initrd}" ; then
-- gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
-+ gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&3
- elif test -z "${initramfs}" ; then
- # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's
- # no initrd or builtin initramfs, it can't work here.
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_netbsd.in grub-2.00.git20131218/util/grub.d/10_netbsd.in
---- grub-2.00.git20131218.orig/util/grub.d/10_netbsd.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_netbsd.in 2013-12-18 14:29:45.000000000 +0100
-@@ -166,7 +166,7 @@
+ config=
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_netbsd.in grub-2.02~beta2/util/grub.d/10_netbsd.in
+--- grub-2.02~beta2.orig/util/grub.d/10_netbsd.in 2013-12-17 18:25:57.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_netbsd.in 2014-01-04 11:34:50.135240649 +0100
+@@ -155,7 +155,7 @@
continue
fi
if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
netbsd_entry "knetbsd" "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}"
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_windows.in grub-2.00.git20131218/util/grub.d/10_windows.in
---- grub-2.00.git20131218.orig/util/grub.d/10_windows.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_windows.in 2013-12-18 14:29:45.000000000 +0100
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in grub-2.02~beta2/util/grub.d/10_windows.in
+--- grub-2.02~beta2.orig/util/grub.d/10_windows.in 2013-12-17 18:25:57.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/10_windows.in 2014-01-04 11:34:50.135240649 +0100
@@ -82,7 +82,7 @@
# Get boot device.
dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
cat << EOF
menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
EOF
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in grub-2.00.git20131218/util/grub.d/20_linux_xen.in
---- grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/20_linux_xen.in 2013-12-18 14:29:45.000000000 +0100
-@@ -198,7 +198,7 @@
- fi
+--- grub-2.04/util/grub.d/20_linux_xen.in.orig 2019-04-23 10:54:47.000000000 +0200
++++ grub-2.04/util/grub.d/20_linux_xen.in 2019-07-05 13:55:11.220267798 +0200
+@@ -243,7 +243,7 @@
+
while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list`
- gettext_printf "Found linux image: %s\n" "$linux" >&2
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -221,7 +221,7 @@
- fi
- done
- if test -n "${initrd}" ; then
-- gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2
-+ gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&3
- else
- # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
- linux_root_device_thisversion=${GRUB_DEVICE}
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/30_os-prober.in grub-2.00.git20131218/util/grub.d/30_os-prober.in
---- grub-2.00.git20131218.orig/util/grub.d/30_os-prober.in 2013-12-18 13:11:29.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/30_os-prober.in 2013-12-18 14:29:45.000000000 +0100
+@@ -274,7 +274,7 @@
+ for i in ${initrd}; do
+ initrd_display="${initrd_display} ${dirname}/${i}"
+ done
+- gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
++ gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&3
+ fi
+
+ if test -z "${initrd_real}"; then
+diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/30_os-prober.in grub-2.02~beta2/util/grub.d/30_os-prober.in
+--- grub-2.02~beta2.orig/util/grub.d/30_os-prober.in 2014-01-04 10:50:51.000000000 +0100
++++ grub-2.02~beta2/util/grub.d/30_os-prober.in 2014-01-04 11:34:50.135240649 +0100
@@ -134,7 +134,7 @@
LONGNAME="${LABEL}"
fi
case ${BOOT} in
chain)
-@@ -321,7 +321,7 @@
+@@ -329,7 +329,7 @@
+ ;;
*)
- echo -n " "
# TRANSLATORS: %s is replaced by OS name.
-- gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2
-+ gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&3
+- gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2
++ gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&3
;;
esac
done
projects / packages / grub2.git / blobdiff