diff options
| author | maximilian attems <maks@debian.org> | 2006-03-15 09:58:00 +0100 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2006-03-15 09:58:00 +0100 |
| commit | b34fe26dd06da3daa40a75a853a96c2013fcfc18 (patch) | |
| tree | ff88406872bb3b2972f5ab11ce80ee4c298796ef | |
| parent | 9c42241824afb2759d22d2cf7962fb2ce534e0dd (diff) | |
run lilo if no grub is around.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | update-initramfs | 16 |
2 files changed, 22 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 8f2f7ea..1571265 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,10 +5,14 @@ initramfs-tools (0.55) unstable; urgency=low * scripts/local: Use quiet to load the fs. (closes: #339092) - * hook-functions: Really add the ieee1394 modules. + * hook-functions: Really add the ieee1394 modules. Thanks to Michael Prokop <mikap@grml.org> for testing the fix. - -- maximilian attems <maks@sternwelten.at> Tue, 14 Mar 2006 10:21:34 +0100 + * update-initramfs: Run lilo on updates if no grub is around. + Thanks Adeodato Simó <adeodato@debian.org> for finding the issue. + (Closes: #356850) + + -- maximilian attems <maks@sternwelten.at> Wed, 15 Mar 2006 09:55:22 +0100 initramfs-tools (0.54) unstable; urgency=low diff --git a/update-initramfs b/update-initramfs index 2e39ed0..08a2f3a 100644 --- a/update-initramfs +++ b/update-initramfs @@ -67,6 +67,20 @@ generate_initramfs() set_sha1 } +# only run lilo if no grub is around +run_bootloader() +{ + if [ -x /sbin/grub -o -e /boot/grub/menu.lst ]; then + return 0 + fi + if [ -e /etc/lilo.conf ]; then + lilo -t > /dev/null + if [ $? -eq 0 ]; then + lilo + fi + fi +} + compare_sha1() { sha1sum "${initramfs}" | diff "${STATEDIR}/${version}" - >/dev/null 2>&1 @@ -199,6 +213,8 @@ update() generate_initramfs + run_bootloader + } delete() |