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

diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index 7766a14..afc95b4 100644
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -1,6 +1,6 @@
-diff -ur grub-2.02-beta3.orig/util/grub.d/00_header.in grub-2.02-beta3/util/grub.d/00_header.in
---- grub-2.02-beta3.orig/util/grub.d/00_header.in	2016-02-28 02:07:41.000000000 +0000
-+++ grub-2.02-beta3/util/grub.d/00_header.in	2016-03-21 07:46:19.222768000 +0000
+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" ] \
@@ -25,9 +25,9 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/00_header.in grub-2.02-beta3/util/grub
  	esac
  	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
  	cat << EOF
-diff -ur grub-2.02-beta3.orig/util/grub.d/10_hurd.in grub-2.02-beta3/util/grub.d/10_hurd.in
---- grub-2.02-beta3.orig/util/grub.d/10_hurd.in	2016-02-28 02:07:41.000000000 +0000
-+++ grub-2.02-beta3/util/grub.d/10_hurd.in	2016-03-21 07:46:19.223768000 +0000
+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`
@@ -61,9 +61,9 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_hurd.in grub-2.02-beta3/util/grub.d
    exit 1
  fi
  
-diff -ur grub-2.02-beta3.orig/util/grub.d/10_kfreebsd.in grub-2.02-beta3/util/grub.d/10_kfreebsd.in
---- grub-2.02-beta3.orig/util/grub.d/10_kfreebsd.in	2016-02-28 02:07:41.000000000 +0000
-+++ grub-2.02-beta3/util/grub.d/10_kfreebsd.in	2016-03-21 07:46:19.223768000 +0000
+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
@@ -82,10 +82,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_kfreebsd.in grub-2.02-beta3/util/gr
      module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
    fi
  
-diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub.d/10_linux.in
---- grub-2.02-beta3.orig/util/grub.d/10_linux.in	2016-02-28 02:07:41.000000000 +0000
-+++ grub-2.02-beta3/util/grub.d/10_linux.in	2016-03-21 07:46:19.224768000 +0000
-@@ -180,7 +180,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`
@@ -94,18 +94,18 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub.
    basename=`basename $linux`
    dirname=`dirname $linux`
    rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -217,7 +217,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 -ur grub-2.02-beta3.orig/util/grub.d/10_netbsd.in grub-2.02-beta3/util/grub.d/10_netbsd.in
---- grub-2.02-beta3.orig/util/grub.d/10_netbsd.in	2016-02-28 02:07:41.000000000 +0000
-+++ grub-2.02-beta3/util/grub.d/10_netbsd.in	2016-03-21 07:46:19.224768000 +0000
+   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
@@ -115,9 +115,9 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_netbsd.in grub-2.02-beta3/util/grub
  
    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.02-beta3.orig/util/grub.d/10_windows.in grub-2.02-beta3/util/grub.d/10_windows.in
---- grub-2.02-beta3.orig/util/grub.d/10_windows.in	2016-02-28 02:07:41.000000000 +0000
-+++ grub-2.02-beta3/util/grub.d/10_windows.in	2016-03-21 07:46:19.224768000 +0000
+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
@@ -127,11 +127,11 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_windows.in grub-2.02-beta3/util/gru
    cat << EOF
  menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
  EOF
-diff -ur grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in grub-2.02-beta3/util/grub.d/20_linux_xen.in
---- grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in	2016-02-28 02:07:41.000000000 +0000
-+++ grub-2.02-beta3/util/grub.d/20_linux_xen.in	2016-03-21 07:46:19.225768000 +0000
-@@ -208,7 +208,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
@@ -139,18 +139,27 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in grub-2.02-beta3/util/g
  	basename=`basename $linux`
  	dirname=`dirname $linux`
  	rel_dirname=`make_system_path_relative_to_its_root $dirname`
-@@ -231,7 +231,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 -ur grub-2.02-beta3.orig/util/grub.d/30_os-prober.in grub-2.02-beta3/util/grub.d/30_os-prober.in
---- grub-2.02-beta3.orig/util/grub.d/30_os-prober.in	2016-02-28 02:07:41.000000000 +0000
-+++ grub-2.02-beta3/util/grub.d/30_os-prober.in	2016-03-21 07:46:56.468768000 +0000
+@@ -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')"
@@ -169,10 +178,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/30_os-prober.in grub-2.02-beta3/util/g
      ;;
    esac
  done
-diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mkconfig.in
---- grub-2.02-beta3.orig/util/grub-mkconfig.in	2016-03-21 07:45:29.000000000 +0000
-+++ grub-2.02-beta3/util/grub-mkconfig.in	2016-03-21 07:46:19.222768000 +0000
-@@ -247,11 +247,16 @@
+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
@@ -191,7 +200,7 @@ diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mk
  
  cat << EOF
  #
-@@ -286,13 +291,16 @@
+@@ -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
@@ -199,9 +208,10 @@ diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mk
 -    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
-     mv -f ${grub_cfg}.new ${grub_cfg}
+@@ -306,5 +311,8 @@
    fi
  fi