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:13:43.784870350 +0200
54 +++ grub-1.98/util/grub.d/30_os-prober.in 2010-07-27 22:42:57.317305712 +0300
59 - echo "Found ${LONGNAME} on ${DEVICE}" >&2
60 + echo "Found ${LONGNAME} on ${DEVICE}" >&3
68 - echo " ${LONGNAME} is not yet supported by grub-mkconfig." >&2
69 + echo " ${LONGNAME} is not yet supported by grub-mkconfig." >&3
73 --- grub-1.97.2/util/grub.d/10_hurd.in~ 2010-03-10 18:15:07.000000000 +0200
74 +++ grub-1.97.2/util/grub.d/10_hurd.in 2010-03-10 18:23:36.364190317 +0200
76 basename=`basename $i`
78 rel_dirname=`make_system_path_relative_to_its_root $dirname`
79 - echo "Found GNU Mach: $i" >&2
80 + echo "Found GNU Mach: $i" >&3
81 kernel=${rel_dirname}/${basename}
86 for i in /hurd/${hurd_fs}.static /hurd/exec ; do
87 if test -e "$i" ; then
88 - echo "Found Hurd module: $i" >&2
89 + echo "Found Hurd module: $i" >&3
93 --- grub-1.97.2/util/grub.d/10_windows.in~ 2010-03-10 18:15:07.000000000 +0200
94 +++ grub-1.97.2/util/grub.d/10_windows.in 2010-03-10 18:24:57.464181349 +0200
97 dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
99 - echo "Found $OS on $dir ($dev)" >&2
100 + echo "Found $OS on $dir ($dev)" >&3
104 --- grub-1.98/util/grub.d/00_header.in~ 2010-07-20 01:42:22.000000000 +0300
105 +++ grub-1.98/util/grub.d/00_header.in 2010-07-27 22:41:33.246481300 +0300
108 if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
109 && is_path_readable_by_grub $GRUB_THEME; then
110 - echo "Found theme: $GRUB_THEME" >&2
111 + echo "Found theme: $GRUB_THEME" >&3
112 prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/ /"
115 --- grub-1.98/util/grub.d/10_kfreebsd.in~ 2010-03-06 22:51:37.000000000 +0200
116 +++ grub-1.98/util/grub.d/10_kfreebsd.in 2010-07-27 22:42:27.877517513 +0300
119 while [ "x$list" != "x" ] ; do
120 kfreebsd=`version_find_latest $list`
121 - echo "Found kernel of FreeBSD: $kfreebsd" >&2
122 + echo "Found kernel of FreeBSD: $kfreebsd" >&3
123 basename=`basename $kfreebsd`
124 dirname=`dirname $kfreebsd`
125 rel_dirname=`make_system_path_relative_to_its_root $dirname`
129 if test -n "${acpi_ko}" ; then
130 - echo "Found ACPI module: ${acpi_ko}" >&2
131 + echo "Found ACPI module: ${acpi_ko}" >&3
132 acpi_ko_basename=`basename ${acpi_ko}`
133 acpi_ko_dirname=`dirname ${acpi_ko}`
134 acpi_ko_rel_dirname=`make_system_path_relative_to_its_root $acpi_ko_dirname`