From c29d49d84418075e1887c965d978c7cc0e07a95f Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Tue, 18 Apr 2006 13:44:02 +0200
Subject: 0.60: - bug script - cryptoroot support - change exported variables -
 nfsopts, rootflags support - warn lilo+grub install - doc fixes

---
 update-initramfs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 update-initramfs

(limited to 'update-initramfs')

diff --git a/update-initramfs b/update-initramfs
old mode 100644
new mode 100755
index 9b69981..488806f
--- a/update-initramfs
+++ b/update-initramfs
@@ -14,7 +14,7 @@ usage()
 Usage: ${0} [OPTION]...
 
 Options:
- -k [version]	Specify kernel version or ALL
+ -k [version]	Specify kernel version or all
  -c		Create a new initramfs
  -u		Update an existing initramfs
  -d		Remove an existing initramfs
@@ -75,6 +75,13 @@ generate_initramfs()
 run_bootloader()
 {
 	if [ -x /sbin/grub -o -e /boot/grub/menu.lst ]; then
+		if [ -e /etc/lilo.conf ]; then
+			echo
+			echo "WARNING: grub and lilo installed."
+			echo "If you use grub as bootloader everything is fine."
+			echo "If you use lilo as bootloader you must run lilo!"
+			echo
+		fi
 		return 0
 	fi
 	if [ -e /etc/lilo.conf ]; then
@@ -205,7 +212,7 @@ update()
 			fi
 			# Don't stop if one version doesn't work.
 			set +e
-			"${0}" "${vflag}" -u -k "${u_version}"
+			"${0}" -u -k "${u_version}" ${vflag}
 			set -e
 		done
 		exit 0
-- 
cgit v1.2.3