From fabe918dee7da26d177d67d4aa8fe3fd6e83e513 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Wed, 23 Aug 2006 09:22:54 +0200
Subject: - improved nfsroo parsing - added rootdelay and rootfstype bootargs -
 document this changes - initrd-tools backward compatible mdadm assembe and
 then run mdrun - update-initramfs really checkout use_bootloader from
 /etc/kernel-img.conf - tighter klibc deps

---
 update-initramfs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'update-initramfs')

diff --git a/update-initramfs b/update-initramfs
index 3ce8f1f..1ec8c7d 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -2,6 +2,7 @@
 
 STATEDIR=/var/lib/initramfs-tools
 BOOTDIR=/boot
+KPKGCONF=/etc/kernel-img.conf
 
 set -e
 
@@ -96,8 +97,8 @@ run_bootloader()
 {
 	if [ -x /sbin/grub -o -e /boot/grub/menu.lst ]; then
 		if [ -e /etc/lilo.conf ]; then
-			do_b=$(awk  '/bootloader/{print $2}' \
-				/etc/kernel-img.conf)
+			[ -r "${KPKGCONF}" ] && \
+			do_b=$(awk  '/bootloader/{print $3}' "${KPKGCONF}")
 			if [ "${do_b}" = "yes" ] || [ "${do_b}" = "Yes" ] \
 				|| [ "${do_b}" = "YES" ]; then
 				run_lilo
-- 
cgit v1.2.3