1 --- grub-1.97.2/util/grub-mkconfig.in~ 2010-03-10 18:09:58.858434588 +0200
2 +++ grub-1.97.2/util/grub-mkconfig.in 2010-03-10 18:11:34.197928250 +0200
5 if test "x${grub_cfg}" != "x"; then
7 + # open fd &3 for diagnostic messages
11 # Allow this to fail, since /boot/grub/ might need to be fatfs to support some
12 # firmware implementations (e.g. OFW or EFI).
13 chmod 400 ${grub_cfg}.new || grub_warn "Could not make ${grub_cfg}.new readable by only root.\
14 This means that if the generated config contains a password it is readable by everyone"
16 + # open fd &3 for diagnostic messages
19 -echo "Generating grub.cfg ..." >&2
20 +echo "Generating grub.cfg ..." >&3
25 mv -f ${grub_cfg}.new ${grub_cfg}
31 +# close diagnostic stream
33 --- grub-1.97.2/util/grub.d/10_linux.in~ 2010-03-10 18:09:58.838434522 +0200
34 +++ grub-1.97.2/util/grub.d/10_linux.in 2010-03-10 18:12:47.478176169 +0200
37 while [ "x$list" != "x" ] ; do
38 linux=`version_find_latest $list`
39 - echo "Found linux image: $linux" >&2
40 + echo "Found linux image: $linux" >&3
41 basename=`basename $linux`
42 dirname=`dirname $linux`
43 rel_dirname=`make_system_path_relative_to_its_root $dirname`
47 if test -n "${initrd}" ; then
48 - echo "Found initrd image: ${dirname}/${initrd}" >&2
49 + echo "Found initrd image: ${dirname}/${initrd}" >&3
51 # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
52 linux_root_device_thisversion=${GRUB_DEVICE}
53 --- grub-1.97.2/util/grub.d/30_os-prober.in~ 2010-03-10 18:09:58.838434522 +0200
54 +++ grub-1.97.2/util/grub.d/30_os-prober.in 2010-03-10 18:13:43.784870350 +0200
59 - echo "Found ${LONGNAME} on ${DEVICE}" >&2
60 + echo "Found ${LONGNAME} on ${DEVICE}" >&3
64 --- grub-1.97.2/util/grub.d/10_hurd.in~ 2010-03-10 18:15:07.000000000 +0200
65 +++ grub-1.97.2/util/grub.d/10_hurd.in 2010-03-10 18:23:36.364190317 +0200
67 basename=`basename $i`
69 rel_dirname=`make_system_path_relative_to_its_root $dirname`
70 - echo "Found GNU Mach: $i" >&2
71 + echo "Found GNU Mach: $i" >&3
72 kernel=${rel_dirname}/${basename}
77 for i in /hurd/${hurd_fs}.static /hurd/exec ; do
78 if test -e "$i" ; then
79 - echo "Found Hurd module: $i" >&2
80 + echo "Found Hurd module: $i" >&3
84 --- grub-1.97.2/util/grub.d/10_windows.in~ 2010-03-10 18:15:07.000000000 +0200
85 +++ grub-1.97.2/util/grub.d/10_windows.in 2010-03-10 18:24:57.464181349 +0200
88 dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
90 - echo "Found $OS on $dir ($dev)" >&2
91 + echo "Found $OS on $dir ($dev)" >&3