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

* util/grub.d/10_linux.in: Try version without ".old" when

Browse source 
looking for initrd.  It's better to use initrd from the newer
kernel of the same version than no initrd at all.
This commit is contained in:
proski 2008-01-02 08:34:41 +00:00
parent d98d9cad88
commit 92695df9e8
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-01-02 Pavel Roskin <proski@gnu.org>
* util/grub.d/10_linux.in: Try version without ".old" when
looking for initrd. It's better to use initrd from the newer
kernel of the same version than no initrd at all.
2008-01-01 Robert Millan <rmh@aybabtu.com> 2008-01-01 Robert Millan <rmh@aybabtu.com>
* util/biosdisk.c (get_os_disk): Fix check for IDE or SCSI discs. * util/biosdisk.c (get_os_disk): Fix check for IDE or SCSI discs.

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

@ -84,9 +84,11 @@ while [ "x$list" != "x" ] ; do
dirname=`dirname $linux` dirname=`dirname $linux`
grub_dirname=`echo ${dirname} | sed -e "s%^/boot%${GRUB_DRIVE_BOOT}%g"` grub_dirname=`echo ${dirname} | sed -e "s%^/boot%${GRUB_DRIVE_BOOT}%g"`
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
alt_version=`echo $version | sed -e "s,\.old$,,g"`
initrd= initrd=
for i in "initrd.img-${version}" "initrd-${version}.img"; do for i in "initrd.img-${version}" "initrd-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img"; do
if test -e "${dirname}/${i}" ; then if test -e "${dirname}/${i}" ; then
initrd="$i" initrd="$i"
break break