X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=grub-mkconfig-diagnostics.patch;h=afc95b479f8e0cc685fdc7d9b16eee5b7f9ff902;hb=37c1d015a25095060b7e8e27365fa2767a402366;hp=94a716f67ca80af1d48b6f3512bbb18f4c17a2f2;hpb=3a8be31c695692a1764fe639ae96595d0effa6b0;p=packages%2Fgrub2.git

diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index 94a716f..afc95b4 100644
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -1,49 +1,6 @@
-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
- #
-@@ -289,13 +294,16 @@
-     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
-   else
-     # none of the children aborted with error, install the new grub.cfg
-     mv -f ${grub_cfg}.new ${grub_cfg}
-   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
+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
 @@ -229,7 +229,7 @@
  if [ "x$gfxterm" = x1 ]; then
      if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
@@ -68,9 +25,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/00_header.in grub
  	esac
  	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
  	cat << EOF
-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
+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
 @@ -45,8 +45,8 @@
      basename=`basename $i`
      dirname=`dirname $i`
@@ -104,10 +61,10 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_hurd.in grub-2
    exit 1
  fi
  
-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 @@
+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 @@
  
  while [ "x$list" != "x" ] ; do
    kfreebsd=`version_find_latest $list`
@@ -116,7 +73,7 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in gr
    basename=`basename $kfreebsd`
    dirname=`dirname $kfreebsd`
    rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -207,7 +207,7 @@
+@@ -210,7 +210,7 @@
      fi
    done
    if test -n "${module_dir}" ; then
@@ -125,10 +82,10 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in gr
      module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
    fi
  
-diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub-2.02~beta2/util/grub.d/10_linux.in
---- grub-2.02~beta2.orig/util/grub.d/10_linux.in	2014-01-04 10:50:51.000000000 +0100
-+++ grub-2.02~beta2/util/grub.d/10_linux.in	2014-01-04 11:34:50.135240649 +0100
-@@ -176,7 +176,7 @@
+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
+@@ -194,7 +194,7 @@
  is_top_level=true
  while [ "x$list" != "x" ] ; do
    linux=`version_find_latest $list`
@@ -137,18 +94,18 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub-
    basename=`basename $linux`
    dirname=`dirname $linux`
    rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -213,7 +213,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 '*~' -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
+   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
 @@ -155,7 +155,7 @@
      continue
    fi
@@ -158,9 +115,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_netbsd.in grub
  
    if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
        netbsd_entry "knetbsd"   "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}"
-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
+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
 @@ -82,7 +82,7 @@
    # Get boot device.
    dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
@@ -170,11 +127,11 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in gru
    cat << EOF
  menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
  EOF
-diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in grub-2.02~beta2/util/grub.d/20_linux_xen.in
---- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in	2014-01-04 10:50:51.000000000 +0100
-+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in	2014-01-04 11:34:50.135240649 +0100
-@@ -204,7 +204,7 @@
-     fi
+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
+@@ -243,7 +243,7 @@
+ 
      while [ "x$list" != "x" ] ; do
  	linux=`version_find_latest $list`
 -	gettext_printf "Found linux image: %s\n" "$linux" >&2
@@ -182,33 +139,86 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in g
  	basename=`basename $linux`
  	dirname=`dirname $linux`
  	rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -227,7 +227,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 '*~' -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}"
+@@ -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 -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 @@
+   # 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')"
  
 -  gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2
 +  gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&3
  
    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
+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>&-