1 diff -ur grub-2.04.orig/util/grub.d/00_header.in grub-2.04/util/grub.d/00_header.in
2 --- grub-2.04.orig/util/grub.d/00_header.in 2019-08-18 15:45:01.994000000 +0200
3 +++ grub-2.04/util/grub.d/00_header.in 2019-08-18 15:45:18.507000000 +0200
5 if [ "x$gfxterm" = x1 ]; then
6 if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
7 && is_path_readable_by_grub "$GRUB_THEME"; then
8 - gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&2
9 + gettext_printf "Found theme: %s\n" "$GRUB_THEME" >&3
11 prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
15 elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
16 && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
17 - gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2
18 + gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&3
19 case "$GRUB_BACKGROUND" in
22 *.jpg|*.jpeg) reader=jpeg ;;
23 - *) gettext "Unsupported image format" >&2; echo >&2; exit 1 ;;
24 + *) gettext "Unsupported image format" >&3; echo >&3; exit 1 ;;
26 prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
28 diff -ur grub-2.04.orig/util/grub.d/10_hurd.in grub-2.04/util/grub.d/10_hurd.in
29 --- grub-2.04.orig/util/grub.d/10_hurd.in 2019-08-18 15:45:01.994000000 +0200
30 +++ grub-2.04/util/grub.d/10_hurd.in 2019-08-18 15:45:18.508000000 +0200
32 basename=`basename $i`
34 rel_dirname=`make_system_path_relative_to_its_root $dirname`
35 - gettext_printf "Found GNU Mach: %s" "$i" >&2
37 + gettext_printf "Found GNU Mach: %s" "$i" >&3
39 kernels="${kernels} ${rel_dirname}/${basename}"
44 for i in /hurd/${hurd_fs}.static /hurd/exec ; do
45 if test -e "$i" ; then
46 - gettext_printf "Found Hurd module: %s" "$i" >&2
48 + gettext_printf "Found Hurd module: %s" "$i" >&3
56 if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
57 - gettext "Some Hurd stuff found, but not enough to boot." >&2
59 + gettext "Some Hurd stuff found, but not enough to boot." >&3
64 diff -ur grub-2.04.orig/util/grub.d/10_kfreebsd.in grub-2.04/util/grub.d/10_kfreebsd.in
65 --- grub-2.04.orig/util/grub.d/10_kfreebsd.in 2019-08-18 15:45:01.994000000 +0200
66 +++ grub-2.04/util/grub.d/10_kfreebsd.in 2019-08-18 15:45:18.508000000 +0200
69 while [ "x$list" != "x" ] ; do
70 kfreebsd=`version_find_latest $list`
71 - gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&2
72 + gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&3
73 basename=`basename $kfreebsd`
74 dirname=`dirname $kfreebsd`
75 rel_dirname=`make_system_path_relative_to_its_root $dirname`
79 if test -n "${module_dir}" ; then
80 - gettext_printf "Found kernel module directory: %s\n" "${module_dir}" >&2
81 + gettext_printf "Found kernel module directory: %s\n" "${module_dir}" >&3
82 module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
85 diff -ur grub-2.04.orig/util/grub.d/10_linux.in grub-2.04/util/grub.d/10_linux.in
86 --- grub-2.04.orig/util/grub.d/10_linux.in 2019-08-18 15:45:01.994000000 +0200
87 +++ grub-2.04/util/grub.d/10_linux.in 2019-08-18 15:46:11.888000000 +0200
90 while [ "x$list" != "x" ] ; do
91 linux=`version_find_latest $list`
92 - gettext_printf "Found linux image: %s\n" "$linux" >&2
93 + gettext_printf "Found linux image: %s\n" "$linux" >&3
94 basename=`basename $linux`
95 dirname=`dirname $linux`
96 rel_dirname=`make_system_path_relative_to_its_root $dirname`
98 for i in ${initrd}; do
99 initrd_display="${initrd_display} ${dirname}/${i}"
101 - gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
102 + gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&3
106 diff -ur grub-2.04.orig/util/grub.d/10_netbsd.in grub-2.04/util/grub.d/10_netbsd.in
107 --- grub-2.04.orig/util/grub.d/10_netbsd.in 2019-08-18 15:45:01.994000000 +0200
108 +++ grub-2.04/util/grub.d/10_netbsd.in 2019-08-18 15:45:18.508000000 +0200
113 - gettext_printf "Found NetBSD kernel: %s\n" "$k" >&2
114 + gettext_printf "Found NetBSD kernel: %s\n" "$k" >&3
116 if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
117 netbsd_entry "knetbsd" "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}"
118 diff -ur grub-2.04.orig/util/grub.d/10_windows.in grub-2.04/util/grub.d/10_windows.in
119 --- grub-2.04.orig/util/grub.d/10_windows.in 2019-08-18 15:45:01.994000000 +0200
120 +++ grub-2.04/util/grub.d/10_windows.in 2019-08-18 15:45:18.508000000 +0200
123 dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
125 - gettext_printf "Found %s on %s (%s)\n" "$OS" "$drv" "$dev" >&2
126 + gettext_printf "Found %s on %s (%s)\n" "$OS" "$drv" "$dev" >&3
128 menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
130 diff -ur grub-2.04.orig/util/grub.d/20_linux_xen.in grub-2.04/util/grub.d/20_linux_xen.in
131 --- grub-2.04.orig/util/grub.d/20_linux_xen.in 2019-08-18 15:45:01.994000000 +0200
132 +++ grub-2.04/util/grub.d/20_linux_xen.in 2019-08-18 15:46:22.468000000 +0200
135 while [ "x$list" != "x" ] ; do
136 linux=`version_find_latest $list`
137 - gettext_printf "Found linux image: %s\n" "$linux" >&2
138 + gettext_printf "Found linux image: %s\n" "$linux" >&3
139 basename=`basename $linux`
140 dirname=`dirname $linux`
141 rel_dirname=`make_system_path_relative_to_its_root $dirname`
143 for i in ${initrd}; do
144 initrd_display="${initrd_display} ${dirname}/${i}"
146 - gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
147 + gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&3
150 if test -z "${initrd_real}"; then
151 diff -ur grub-2.04.orig/util/grub.d/30_os-prober.in grub-2.04/util/grub.d/30_os-prober.in
152 --- grub-2.04.orig/util/grub.d/30_os-prober.in 2019-08-18 15:45:01.994000000 +0200
153 +++ grub-2.04/util/grub.d/30_os-prober.in 2019-08-18 15:47:18.536000000 +0200
157 if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" ] && [ "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then
158 - echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&2
159 + echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&3
164 # os-prober returns text string followed by optional counter
165 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')"
167 - gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2
168 + gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&3
175 # TRANSLATORS: %s is replaced by OS name.
176 - gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2
177 + gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&3
181 diff -ur grub-2.04.orig/util/grub-mkconfig.in grub-2.04/util/grub-mkconfig.in
182 --- grub-2.04.orig/util/grub-mkconfig.in 2019-08-18 15:45:01.994000000 +0200
183 +++ grub-2.04/util/grub-mkconfig.in 2019-08-18 15:45:18.509000000 +0200
184 @@ -258,11 +258,16 @@
185 if test "x${grub_cfg}" != "x"; then
186 rm -f "${grub_cfg}.new"
187 oldumask=$(umask); umask 077
188 + # open fd &3 for diagnostic messages
190 exec > "${grub_cfg}.new"
193 + # open fd &3 for diagnostic messages
196 -gettext "Generating grub configuration file ..." >&2
198 +gettext "Generating grub configuration file ..." >&3
204 gettext_printf "Syntax errors are detected in generated GRUB config file.
205 Ensure that there are no errors in /etc/sysconfig/grub
206 and /etc/grub.d/* files or please file a bug report with
207 -%s file attached." "${grub_cfg}.new" >&2
209 +%s file attached." "${grub_cfg}.new" >&3
213 # none of the children aborted with error, install the new grub.cfg
223 +# close diagnostic stream