vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2008-06-21 Robert Millan <rmh@aybabtu.com>

Browse source 
* util/grub.d/00_header.in: Move last prepare_grub_to_access_device()
        call from here ...

        * util/grub.d/10_hurd.in: ... to here ...
        * util/grub.d/10_linux.in: ... and here.
This commit is contained in:
robertmh 2008-06-21 13:51:19 +00:00
parent 650e1c79b9
commit 76a2bd44b3
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-06-21 Robert Millan <rmh@aybabtu.com>
* util/grub.d/00_header.in: Move last prepare_grub_to_access_device()
call from here ...
* util/grub.d/10_hurd.in: ... to here ...
* util/grub.d/10_linux.in: ... and here.
2008-06-19 Robert Millan <rmh@aybabtu.com> 2008-06-19 Robert Millan <rmh@aybabtu.com>
* kern/main.c (grub_main): Export `prefix' variable inmediately * kern/main.c (grub_main): Export `prefix' variable inmediately

3
util/grub.d/00_header.in
View file

@ -62,6 +62,3 @@ EOF
echo "terminal ${GRUB_TERMINAL}" echo "terminal ${GRUB_TERMINAL}"
;; ;;
esac esac
# Set the root device.
prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}

2
util/grub.d/10_hurd.in
View file

@ -63,6 +63,8 @@ if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
exit 1 exit 1
fi fi
prepare_grub_to_access_device ${GRUB_DEVICE}
cat << EOF cat << EOF
menuentry "${OS}" { menuentry "${OS}" {
multiboot ${kernel} root=device:${GRUB_DEVICE} multiboot ${kernel} root=device:${GRUB_DEVICE}

4
util/grub.d/10_linux.in
View file

@ -97,6 +97,10 @@ list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done` done`
if [ "x$list" != "x" ] ; then
prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}
fi
while [ "x$list" != "x" ] ; do while [ "x$list" != "x" ] ; do
linux=`find_latest $list` linux=`find_latest $list`
echo "Found linux image: $linux" >&2 echo "Found linux image: $linux" >&2