From 839572386f35bf4b4404dac5f976566bc155de94 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Thu, 17 Aug 2006 17:14:01 +0200
Subject: Release 0.74: - scripts/functions: fix debug boot param -
 update-initramfs: checkout /etc/kernel-img.conf if lilo and grub is installed
 - rename mdraid to mdrun, readd mdrun as it seems to work much better   with
 sarge systems - add an help message for rescue shell - better package desc

---
 update-initramfs | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'update-initramfs')

diff --git a/update-initramfs b/update-initramfs
index ea74136..e7dc586 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -81,11 +81,28 @@ generate_initramfs()
 	fi
 }
 
+# lilo call
+run_lilo()
+{
+	lilo -t > /dev/null
+	if [ $? -eq 0 ]; then
+		lilo
+	fi
+}
+
 # only run lilo if no grub is around
+# or if "do_bootloader = yes" is set
 run_bootloader()
 {
 	if [ -x /sbin/grub -o -e /boot/grub/menu.lst ]; then
 		if [ -e /etc/lilo.conf ]; then
+			do_bootloader=$(awk  '/bootloader/{print $2}' \
+				/etc/kernel-img.conf)
+			if [ "${do_bootloader}" = "yes" ]; then
+				run_lilo
+				return 0
+			fi
+
 			echo
 			echo "WARNING: grub and lilo installed."
 			echo "If you use grub as bootloader everything is fine."
@@ -95,10 +112,7 @@ run_bootloader()
 		return 0
 	fi
 	if [ -e /etc/lilo.conf ]; then
-		lilo -t > /dev/null
-		if [ $? -eq 0 ]; then
-			lilo
-		fi
+		run_lilo
 	fi
 }
 
-- 
cgit v1.2.3