diff options
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | update-initramfs | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 6c06903..51987c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +initramfs-tools (0.80) unstable; urgency=low + + * update-initramfs: Test for lilo executable earlier otherwise an warning + would be issued with grub installed and left over lilo config. + + -- maximilian attems <maks@sternwelten.at> Tue, 12 Sep 2006 15:59:14 +0200 + initramfs-tools (0.79) unstable; urgency=high * update-initramfs: Allow create and delete to work on "all" kernelversions. diff --git a/update-initramfs b/update-initramfs index fa6c837..d1b7026 100755 --- a/update-initramfs +++ b/update-initramfs @@ -85,9 +85,6 @@ generate_initramfs() # lilo call run_lilo() { - if [ ! -x /sbin/lilo ]; then - return 0 - fi lilo -t > /dev/null if [ $? -eq 0 ]; then lilo @@ -99,7 +96,7 @@ run_lilo() run_bootloader() { if [ -x /sbin/grub ] || [ -e /boot/grub/menu.lst ]; then - if [ -e /etc/lilo.conf ]; then + if [ -e /etc/lilo.conf ] && [ -x /sbin/lilo ]; then [ -r "${KPKGCONF}" ] && \ do_b=$(awk '/bootloader/{print $3}' "${KPKGCONF}") if [ "${do_b}" = "yes" ] || [ "${do_b}" = "Yes" ] \ |