Bug#374371: update-grub fix

[Jason Rhinelander]

Otavio Salvador wrote:
> Can you please provide a test case were it was failing and now it's
> working?
>

Sure,

Starting from an unpatched /usr/sbin/update-grub:

jagerman at hades:~$ ls -l /boot/vmlinuz-2.6.*
-rw-r--r-- 1 root root 1366789 2006-12-02 12:43 /boot/vmlinuz-2.6.19
-rw-r--r-- 1 root root 1370776 2007-02-05 12:58 /boot/vmlinuz-2.6.20
-rw-r--r-- 1 root root 1415992 2006-12-23 16:03 /boot/vmlinuz-2.6.20-rc1
-rw-r--r-- 1 root root 1371384 2007-01-31 14:09 /boot/vmlinuz-2.6.20-rc6

jagerman at hades:~$ sudo update-grub
Searching for GRUB installation directory ... found: /boot/grub
Searching for default file ... found: /boot/grub/default
Testing for an existing GRUB menu.lst file ... found: /boot/grub/menu.lst
Searching for splash image ... none found, skipping ...
grep: /boot/config*: No such file or directory
Found kernel: /boot/vmlinuz-2.6.20-rc6
Found kernel: /boot/vmlinuz-2.6.20-rc1
Found kernel: /boot/vmlinuz-2.6.20
Found kernel: /boot/vmlinuz-2.6.19
Found kernel: /boot/memtest86+.bin
Updating /boot/grub/menu.lst ... done

jagerman at hades:~$ grep ^kernel /boot/grub/menu.lst
kernel          /boot/vmlinuz-2.6.20-rc6 root=/dev/sda1 ro
kernel          /boot/vmlinuz-2.6.20-rc1 root=/dev/sda1 ro
kernel          /boot/vmlinuz-2.6.20 root=/dev/sda1 ro
kernel          /boot/vmlinuz-2.6.19 root=/dev/sda1 ro
kernel          /boot/memtest86+.bin



The position of 2.6.20 in the above is wrong: 2.6.20 should be treated
as newer than 2.6.20-rc*.  With the patch applied:


jagerman at hades:~$ sudo patch -i update-grub.patch /usr/sbin/update-grub
patching file /usr/sbin/update-grub

jagerman at hades:~$ sudo update-grub
Searching for GRUB installation directory ... found: /boot/grub
Searching for default file ... found: /boot/grub/default
Testing for an existing GRUB menu.lst file ... found: /boot/grub/menu.lst
Searching for splash image ... none found, skipping ...
grep: /boot/config*: No such file or directory
Found kernel: /boot/vmlinuz-2.6.20
Found kernel: /boot/vmlinuz-2.6.20-rc6
Found kernel: /boot/vmlinuz-2.6.20-rc1
Found kernel: /boot/vmlinuz-2.6.19
Found kernel: /boot/memtest86+.bin
Updating /boot/grub/menu.lst ... done

jagerman at hades:~$ grep ^kernel /boot/grub/menu.lst
kernel          /boot/vmlinuz-2.6.20 root=/dev/sda1 ro
kernel          /boot/vmlinuz-2.6.20-rc6 root=/dev/sda1 ro
kernel          /boot/vmlinuz-2.6.20-rc1 root=/dev/sda1 ro
kernel          /boot/vmlinuz-2.6.19 root=/dev/sda1 ro
kernel          /boot/memtest86+.bin



-- 
-- Jason Rhinelander