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

diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index 94a716f..58c3cad 100644
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -1,50 +1,7 @@
-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
-@@ -229,7 +229,7 @@
+diff -urNp grub-2.02-rc1.orig/util/grub.d/00_header.in grub-2.02-rc1/util/grub.d/00_header.in
+--- grub-2.02-rc1.orig/util/grub.d/00_header.in	2017-02-08 15:03:12.814319390 +0000
++++ grub-2.02-rc1/util/grub.d/00_header.in	2017-02-08 15:03:25.069319252 +0000
+@@ -229,7 +229,7 @@ esac
  if [ "x$gfxterm" = x1 ]; then
      if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
  	&& is_path_readable_by_grub "$GRUB_THEME"; then
@@ -53,7 +10,7 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/00_header.in grub
  
  	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
  	cat << EOF
-@@ -265,12 +265,12 @@
+@@ -265,12 +265,12 @@ export theme
  EOF
      elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
  	    && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
@@ -68,10 +25,10 @@ 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
-@@ -45,8 +45,8 @@
+diff -urNp grub-2.02-rc1.orig/util/grub.d/10_hurd.in grub-2.02-rc1/util/grub.d/10_hurd.in
+--- grub-2.02-rc1.orig/util/grub.d/10_hurd.in	2017-02-08 15:03:12.814319390 +0000
++++ grub-2.02-rc1/util/grub.d/10_hurd.in	2017-02-08 15:03:25.069319252 +0000
+@@ -45,8 +45,8 @@ for i in /boot/gnumach* ; do
      basename=`basename $i`
      dirname=`dirname $i`
      rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -82,7 +39,7 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_hurd.in grub-2
      kernels="${kernels} ${rel_dirname}/${basename}"
      at_least_one=true
    fi
-@@ -60,8 +60,8 @@
+@@ -60,8 +60,8 @@ esac
  
  for i in /hurd/${hurd_fs}.static /hurd/exec ; do
    if test -e "$i" ; then
@@ -93,7 +50,7 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_hurd.in grub-2
      at_least_one=true
    else
      all_of_them=false
-@@ -74,8 +74,8 @@
+@@ -74,8 +74,8 @@ if ${at_least_one} ; then : ; else
  fi
  
  if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
@@ -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 -urNp grub-2.02-rc1.orig/util/grub.d/10_kfreebsd.in grub-2.02-rc1/util/grub.d/10_kfreebsd.in
+--- grub-2.02-rc1.orig/util/grub.d/10_kfreebsd.in	2017-02-08 15:03:12.814319390 +0000
++++ grub-2.02-rc1/util/grub.d/10_kfreebsd.in	2017-02-08 15:03:25.069319252 +0000
+@@ -161,7 +161,7 @@ is_top_level=true
  
  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 @@ while [ "x$list" != "x" ] ; do
      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 -urNp grub-2.02-rc1.orig/util/grub.d/10_linux.in grub-2.02-rc1/util/grub.d/10_linux.in
+--- grub-2.02-rc1.orig/util/grub.d/10_linux.in	2017-02-08 15:03:12.814319390 +0000
++++ grub-2.02-rc1/util/grub.d/10_linux.in	2017-02-08 15:03:25.070319252 +0000
+@@ -180,7 +180,7 @@ submenu_indentation=""
  is_top_level=true
  while [ "x$list" != "x" ] ; do
    linux=`version_find_latest $list`
@@ -137,7 +94,7 @@ 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 @@
+@@ -217,7 +217,7 @@ while [ "x$list" != "x" ] ; do
    fi
  
    if test -n "${initrd}" ; then
@@ -146,10 +103,10 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub-
    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
-@@ -155,7 +155,7 @@
+diff -urNp grub-2.02-rc1.orig/util/grub.d/10_netbsd.in grub-2.02-rc1/util/grub.d/10_netbsd.in
+--- grub-2.02-rc1.orig/util/grub.d/10_netbsd.in	2017-02-08 15:03:12.814319390 +0000
++++ grub-2.02-rc1/util/grub.d/10_netbsd.in	2017-02-08 15:03:25.070319252 +0000
+@@ -155,7 +155,7 @@ for k in /netbsd $(ls -t /netbsd?* 2>/de
      continue
    fi
  
@@ -158,10 +115,10 @@ 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
-@@ -82,7 +82,7 @@
+diff -urNp grub-2.02-rc1.orig/util/grub.d/10_windows.in grub-2.02-rc1/util/grub.d/10_windows.in
+--- grub-2.02-rc1.orig/util/grub.d/10_windows.in	2017-02-08 15:03:12.814319390 +0000
++++ grub-2.02-rc1/util/grub.d/10_windows.in	2017-02-08 15:03:25.070319252 +0000
+@@ -82,7 +82,7 @@ for drv in $drives ; do
    # Get boot device.
    dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
  
@@ -170,10 +127,10 @@ 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 @@
+diff -urNp grub-2.02-rc1.orig/util/grub.d/20_linux_xen.in grub-2.02-rc1/util/grub.d/20_linux_xen.in
+--- grub-2.02-rc1.orig/util/grub.d/20_linux_xen.in	2017-02-08 15:03:12.814319390 +0000
++++ grub-2.02-rc1/util/grub.d/20_linux_xen.in	2017-02-08 15:03:25.070319252 +0000
+@@ -208,7 +208,7 @@ while [ "x${xen_list}" != "x" ] ; do
      fi
      while [ "x$list" != "x" ] ; do
  	linux=`version_find_latest $list`
@@ -182,7 +139,7 @@ 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 @@
+@@ -231,7 +231,7 @@ while [ "x${xen_list}" != "x" ] ; do
  	    fi
  	done
  	if test -n "${initrd}" ; then
@@ -191,24 +148,68 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in g
  	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}"
-   fi
+diff -urNp grub-2.02-rc1.orig/util/grub.d/30_os-prober.in grub-2.02-rc1/util/grub.d/30_os-prober.in
+--- grub-2.02-rc1.orig/util/grub.d/30_os-prober.in	2017-02-08 15:03:12.814319390 +0000
++++ grub-2.02-rc1/util/grub.d/30_os-prober.in	2017-02-08 15:03:25.070319252 +0000
+@@ -141,7 +141,7 @@ for OS in ${OSPROBED} ; do
+   # 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 @@ EOF
+     ;;
      *)
-       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 -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkconfig.in
+--- grub-2.02-rc1.orig/util/grub-mkconfig.in	2017-02-08 15:03:12.813319390 +0000
++++ grub-2.02-rc1/util/grub-mkconfig.in	2017-02-08 15:04:41.230318395 +0000
+@@ -247,11 +247,16 @@ export GRUB_DEFAULT \
+ 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,8 +291,8 @@ if test "x${grub_cfg}" != "x" ; then
+     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
+@@ -295,5 +300,8 @@ and /etc/grub.d/* files or please file a
+   fi
+ fi
+ 
+-gettext "done" >&2
+-echo >&2
++gettext "done" >&3
++echo >&3
++
++# close diagnostic stream
++exec 3>&-