HI Just got this today on an upgrade.
Here are the two files:

**********************************************************
## ## End Default Options ##

<<<<<<< Current
title           Ubuntu 9.04, bob kernel 2.6.28-15-generic
||||||| Older
title           Ubuntu 9.04, kernel 2.6.28-15-generic
=======
title           Ubuntu 9.04, kernel 2.6.28-16-generic
uuid            77574d0c-4a11-48bf-a142-c3e01faf9c78
kernel          /boot/vmlinuz-2.6.28-16-generic 
root=UUID=77574d0c-4a11-48bf-a142-c3e01faf9c78 ro quiet splash 
initrd          /boot/initrd.img-2.6.28-16-generic
quiet

title           Ubuntu 9.04, kernel 2.6.28-16-generic (recovery mode)
uuid            77574d0c-4a11-48bf-a142-c3e01faf9c78
kernel          /boot/vmlinuz-2.6.28-16-generic 
root=UUID=77574d0c-4a11-48bf-a142-c3e01faf9c78 ro  single
initrd          /boot/initrd.img-2.6.28-16-generic

title           Ubuntu 9.04, kernel 2.6.28-15-generic
>>>>>>> New
uuid            77574d0c-4a11-48bf-a142-c3e01faf9c78
kernel          /boot/vmlinuz-2.6.28-15-generic 
root=UUID=77574d0c-4a11-48bf-a142-c3e01faf9c78 ro quiet splash 
initrd          /boot/initrd.img-2.6.28-15-generic
quiet

title           Ubuntu 9.04, kernel 2.6.28-15-generic (recovery mode)
uuid            77574d0c-4a11-48bf-a142-c3e01faf9c78
kernel          /boot/vmlinuz-2.6.28-15-generic 
root=UUID=77574d0c-4a11-48bf-a142-c3e01faf9c78 ro  single
initrd          /boot/initrd.img-2.6.28-15-generic


### END DEBIAN AUTOMAGIC KERNELS LIST


****************************************************************

menu list:


***************************************************************

## ## End Default Options ##

title           Ubuntu 9.04, bob kernel 2.6.28-15-generic
uuid            77574d0c-4a11-48bf-a142-c3e01faf9c78
kernel          /boot/vmlinuz-2.6.28-15-generic 
root=UUID=77574d0c-4a11-48bf-a142-c3e01faf9c78 ro quiet splash 
initrd          /boot/initrd.img-2.6.28-15-generic
quiet

title           Ubuntu 9.04, kernel 2.6.28-15-generic (recovery mode)
uuid            77574d0c-4a11-48bf-a142-c3e01faf9c78
kernel          /boot/vmlinuz-2.6.28-15-generic 
root=UUID=77574d0c-4a11-48bf-a142-c3e01faf9c78 ro  single
initrd          /boot/initrd.img-2.6.28-15-generic


### END DEBIAN AUTOMAGIC KERNELS LIST

# This is a divider, added to separate the menu items below from the Debian
# ones.
title           Other operating systems:
root


# This entry automatically added by the Debian installer for an existing
# linux installation on /dev/sdb1.
title           Zenwalk GNU/Linux (on /dev/sdb1)
root            (hd1,0)
kernel          /boot/vmlinuz root=/dev/sdb1 ro splash=silent resume=/dev/sdb2 
vga=791 
initrd          /boot/initrd.splash
savedefault
boot


# This entry automatically added by the Debian installer for an existing
# linux installation on /dev/sdb1.
title           Zenwalk GNU/Linux (recovery mode) (on /dev/sdb1)
root            (hd1,0)
kernel          /boot/vmlinuz root=/dev/sdb1 ro 1 
initrd          /boot/initrd.splash
savedefault
boot

*********************************************************************************

So it's still a problem at the moment.

Cheers
Bob ( user)

-- 
Three-way merge issues with menu.lst file during kernel updates: "Conflicts 
found! Please edit `/var/run/grub/menu.lst' and sort them out manually."
https://bugs.launchpad.net/bugs/269539
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to