up to 2.12

[packages/grub2.git] / grub-mkconfig-diagnostics.patch

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" ] \
 	&& is_path_readable_by_grub "$GRUB_THEME"; then
-	gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&2
+	gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&3
 
 	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
 	cat << EOF
@@ -265,12 +265,12 @@
 EOF
     elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
 	    && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
-	gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2
+	gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&3
 	case "$GRUB_BACKGROUND" in 
 	    *.png)         reader=png ;;
 	    *.tga)         reader=tga ;;
 	    *.jpg|*.jpeg)  reader=jpeg ;;
-	    *)             gettext "Unsupported image format" >&2; echo >&2; exit 1 ;;
+	    *)             gettext "Unsupported image format" >&3; echo >&3; exit 1 ;;
 	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 @@
     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
+    echo >&3
     kernels="${kernels} ${rel_dirname}/${basename}"
     at_least_one=true
   fi
@@ -60,8 +60,8 @@
 
 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
+    echo >&3
     at_least_one=true
   else
     all_of_them=false
@@ -74,8 +74,8 @@
 fi
 
 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
+  echo >&3
   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 @@
 is_top_level=true
 
 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`
@@ -207,7 +207,7 @@
     fi
   done
   if test -n "${module_dir}" ; then
-    gettext_printf "Found kernel module directory: %s\n" "${module_dir}" >&2
+    gettext_printf "Found kernel module directory: %s\n" "${module_dir}" >&3
     module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
   fi
 
--- 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
 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`
   dirname=`dirname $linux`
   rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -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
 
   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
 
-  gettext_printf "Found NetBSD kernel: %s\n" "$k" >&2
+  gettext_printf "Found NetBSD kernel: %s\n" "$k" >&3
 
   # 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
 
-  gettext_printf "Found %s on %s (%s)\n" "$OS" "$drv" "$dev" >&2
+  gettext_printf "Found %s on %s (%s)\n" "$OS" "$drv" "$dev" >&3
   cat << EOF
 menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
 EOF
--- 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
 
     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`
 	dirname=`dirname $linux`
 	rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -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 @@
   # 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)
@@ -329,7 +329,7 @@
     ;;
     *)
       # 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
     ;;
   esac
 done