diff -u grub-0.97/debian/update-grub grub-0.97/debian/update-grub --- grub-0.97/debian/update-grub +++ grub-0.97/debian/update-grub @@ -22,6 +22,7 @@ # David B.Harris # Marc Haber # Crispin Flowerday +# Raphaël Pinson # Abort on errors set -e @@ -763,7 +764,7 @@ echo >> $buffer echo -n "Searching for splash image ... " -current_splash=`grep '^splashimage=' ${grub_dir}/menu.lst || true` +current_splash=`grep '^splashimage=' $menu | head -n 1 || true` splashimage_path="splashimage=${grub_root_device}${grub_dir##${boot_device:+/boot}}/splash.xpm.gz" if [ -f "${grub_dir}/splash.xpm.gz" ] && [ "$current_splash" = "" ]; then echo "found: /boot/grub/splash.xpm.gz" @@ -781,6 +782,11 @@ echo "none found, skipping ..." fi +# Remove all ^splashimage lines from the original file so they are not duplicate by update-grub +sed -e '/^splashimage=.*/d' $menu > $menu.new +cat $menu.new > $menu +rm -f $menu.new + sortedKernels="" for kern in $(/bin/ls -1vr /boot | grep -v "dpkg-*" | grep "^vmlinuz-") ; do # found a kernel diff -u grub-0.97/debian/changelog grub-0.97/debian/changelog --- grub-0.97/debian/changelog +++ grub-0.97/debian/changelog @@ -1,3 +1,10 @@ +grub (0.97-1ubuntu6) dapper; urgency=low + + * Fix duplicating splashimage line in debian/update-grub + (Closes: Malone #32333) + + -- Raphaël Pinson Tue, 28 Feb 2006 12:46:20 +0100 + grub (0.97-1ubuntu5) dapper; urgency=low * debian/patches/ubuntu_update_grub.diff: