2007-05-13 Robert Millan <rmh@aybabtu.com>

* util/update-grub.in: Fix a few assumptions about the devices holding
	/, /boot and /boot/grub being the same.
	* util/grub.d/00_header.in: Likewise.
	* util/grub.d/10_hurd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.

	* util/grub.d/10_linux.in: Implement Linux image sorting with arbitrary
	patterns.  Use that to define the `.old' suffix as older than `'.

	* util/grub.d/00_header.in: Set default gfxmode to `800x600x16'.

	* util/update-grub.in: Add a reference to ${sysconfdir}/default/grub in
	the grub.cfg header message.
This commit is contained in:
robertmh 2007-05-13 19:28:54 +00:00
parent 2e610d6273
commit 57f9639766
5 changed files with 134 additions and 27 deletions

View file

@ -23,11 +23,19 @@ else
OS="${GRUB_DISTRIBUTOR} GNU/Hurd"
fi
at_least_one=false
all_of_them=true
# FIXME: add l4 here?
kernel=
for i in /boot/gnumach.gz /boot/gnumach ; do
if test -e $i ; then
kernel=$i
basename=`basename $i`
dirname=`dirname $i`
grub_dirname=`echo ${dirname} | sed -e "s%^/boot%${GRUB_DRIVE_BOOT}%g"`
echo "Found GNU Mach: $i" >&2
kernel=${grub_dirname}/${basename}
at_least_one=true
fi
done
@ -37,10 +45,8 @@ case "${GRUB_FS}" in
*) hurd_fs="${GRUB_FS}fs" ;;
esac
at_least_one=false
all_of_them=true
for i in "${kernel}" /hurd/${hurd_fs}.static /hurd/exec ; do
if test -e "$i" ; then
for i in /hurd/${hurd_fs}.static /hurd/exec ; do
if test -e "$i" ; then
echo "Found Hurd module: $i" >&2
at_least_one=true
else