X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=grub-mkconfig-diagnostics.patch;h=36edb0bc34137bda245a7f9e5ecba458d84214af;hp=afc95b479f8e0cc685fdc7d9b16eee5b7f9ff902;hb=HEAD;hpb=37c1d015a25095060b7e8e27365fa2767a402366 diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch index afc95b4..36edb0b 100644 --- a/grub-mkconfig-diagnostics.patch +++ b/grub-mkconfig-diagnostics.patch @@ -1,6 +1,48 @@ -diff -ur grub-2.04.orig/util/grub.d/00_header.in grub-2.04/util/grub.d/00_header.in ---- grub-2.04.orig/util/grub.d/00_header.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub.d/00_header.in 2019-08-18 15:45:18.507000000 +0200 +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 ++ # open fd &3 for diagnostic messages ++ exec 3>&1 + exec > "${grub_cfg}.new" + umask $oldumask ++else ++ # open fd &3 for diagnostic messages ++ exec 3>&2 + fi +-gettext "Generating grub configuration file ..." >&2 +-echo >&2 ++gettext "Generating grub configuration file ..." >&3 ++echo >&3 + + cat << EOF + # +@@ -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 ++%s file attached." "${grub_cfg}.new" >&3 + echo >&2 + exit 1 + else +@@ -295,5 +300,8 @@ + fi + fi + +-gettext "done" >&2 +-echo >&2 ++gettext "done" >&3 ++echo >&3 ++ ++# close diagnostic stream ++exec 3>&- +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" ] \ @@ -25,9 +67,9 @@ diff -ur grub-2.04.orig/util/grub.d/00_header.in grub-2.04/util/grub.d/00_header esac prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` cat << EOF -diff -ur grub-2.04.orig/util/grub.d/10_hurd.in grub-2.04/util/grub.d/10_hurd.in ---- grub-2.04.orig/util/grub.d/10_hurd.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub.d/10_hurd.in 2019-08-18 15:45:18.508000000 +0200 +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` @@ -61,19 +103,19 @@ diff -ur grub-2.04.orig/util/grub.d/10_hurd.in grub-2.04/util/grub.d/10_hurd.in exit 1 fi -diff -ur grub-2.04.orig/util/grub.d/10_kfreebsd.in grub-2.04/util/grub.d/10_kfreebsd.in ---- grub-2.04.orig/util/grub.d/10_kfreebsd.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub.d/10_kfreebsd.in 2019-08-18 15:45:18.508000000 +0200 -@@ -161,7 +161,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 @@ + is_top_level=true - while [ "x$list" != "x" ] ; do - kfreebsd=`version_find_latest $list` + for kfreebsd in ${reverse_sorted_list}; do - gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&2 + gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&3 basename=`basename $kfreebsd` dirname=`dirname $kfreebsd` rel_dirname=`make_system_path_relative_to_its_root $dirname` -@@ -210,7 +210,7 @@ +@@ -207,7 +207,7 @@ fi done if test -n "${module_dir}" ; then @@ -82,13 +124,12 @@ diff -ur grub-2.04.orig/util/grub.d/10_kfreebsd.in grub-2.04/util/grub.d/10_kfre module_dir_rel=$(make_system_path_relative_to_its_root $module_dir) fi -diff -ur grub-2.04.orig/util/grub.d/10_linux.in grub-2.04/util/grub.d/10_linux.in ---- grub-2.04.orig/util/grub.d/10_linux.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub.d/10_linux.in 2019-08-18 15:46:11.888000000 +0200 +--- 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` + for linux in ${reverse_sorted_list}; do - gettext_printf "Found linux image: %s\n" "$linux" >&2 + gettext_printf "Found linux image: %s\n" "$linux" >&3 basename=`basename $linux` @@ -103,9 +144,9 @@ diff -ur grub-2.04.orig/util/grub.d/10_linux.in grub-2.04/util/grub.d/10_linux.i fi config= -diff -ur grub-2.04.orig/util/grub.d/10_netbsd.in grub-2.04/util/grub.d/10_netbsd.in ---- grub-2.04.orig/util/grub.d/10_netbsd.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub.d/10_netbsd.in 2019-08-18 15:45:18.508000000 +0200 +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 @@ -113,11 +154,11 @@ diff -ur grub-2.04.orig/util/grub.d/10_netbsd.in grub-2.04/util/grub.d/10_netbsd - gettext_printf "Found NetBSD kernel: %s\n" "$k" >&2 + gettext_printf "Found NetBSD kernel: %s\n" "$k" >&3 - if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then - netbsd_entry "knetbsd" "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}" -diff -ur grub-2.04.orig/util/grub.d/10_windows.in grub-2.04/util/grub.d/10_windows.in ---- grub-2.04.orig/util/grub.d/10_windows.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub.d/10_windows.in 2019-08-18 15:45:18.508000000 +0200 + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to +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 @@ -127,13 +168,12 @@ diff -ur grub-2.04.orig/util/grub.d/10_windows.in grub-2.04/util/grub.d/10_windo cat << EOF menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' { EOF -diff -ur grub-2.04.orig/util/grub.d/20_linux_xen.in grub-2.04/util/grub.d/20_linux_xen.in ---- grub-2.04.orig/util/grub.d/20_linux_xen.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub.d/20_linux_xen.in 2019-08-18 15:46:22.468000000 +0200 +--- 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 @@ + done - while [ "x$list" != "x" ] ; do - linux=`version_find_latest $list` + for linux in ${reverse_sorted_linux_list}; do - gettext_printf "Found linux image: %s\n" "$linux" >&2 + gettext_printf "Found linux image: %s\n" "$linux" >&3 basename=`basename $linux` @@ -148,19 +188,10 @@ diff -ur grub-2.04.orig/util/grub.d/20_linux_xen.in grub-2.04/util/grub.d/20_lin fi if test -z "${initrd_real}"; then -diff -ur grub-2.04.orig/util/grub.d/30_os-prober.in grub-2.04/util/grub.d/30_os-prober.in ---- grub-2.04.orig/util/grub.d/30_os-prober.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub.d/30_os-prober.in 2019-08-18 15:47:18.536000000 +0200 -@@ -123,7 +123,7 @@ - fi - - if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" ] && [ "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then -- echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&2 -+ echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&3 - continue - fi - fi -@@ -141,7 +141,7 @@ +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 @@ # os-prober returns text string followed by optional counter CLASS="--class $(echo "${LABEL}" | LC_ALL=C sed 's,[[:digit:]]*$,,' | cut -d' ' -f1 | tr 'A-Z' 'a-z' | LC_ALL=C sed 's,[^[:alnum:]_],_,g')" @@ -178,47 +209,3 @@ diff -ur grub-2.04.orig/util/grub.d/30_os-prober.in grub-2.04/util/grub.d/30_os- ;; esac done -diff -ur grub-2.04.orig/util/grub-mkconfig.in grub-2.04/util/grub-mkconfig.in ---- grub-2.04.orig/util/grub-mkconfig.in 2019-08-18 15:45:01.994000000 +0200 -+++ grub-2.04/util/grub-mkconfig.in 2019-08-18 15:45:18.509000000 +0200 -@@ -258,11 +258,16 @@ - if test "x${grub_cfg}" != "x"; then - rm -f "${grub_cfg}.new" - oldumask=$(umask); umask 077 -+ # open fd &3 for diagnostic messages -+ exec 3>&1 - exec > "${grub_cfg}.new" - umask $oldumask -+else -+ # open fd &3 for diagnostic messages -+ exec 3>&2 - fi --gettext "Generating grub configuration file ..." >&2 --echo >&2 -+gettext "Generating grub configuration file ..." >&3 -+echo >&3 - - cat << EOF - # -@@ -297,8 +302,8 @@ - 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 - exit 1 - else - # none of the children aborted with error, install the new grub.cfg -@@ -306,5 +311,8 @@ - fi - fi - --gettext "done" >&2 --echo >&2 -+gettext "done" >&3 -+echo >&3 -+ -+# close diagnostic stream -+exec 3>&-