0.60:

- bug script
- cryptoroot support
- change exported variables
- nfsopts, rootflags support
- warn lilo+grub install
- doc fixes

9 files changed, 75 insertions, 10 deletions

diff --git a/debian/bug b/debian/bug
new file mode 100755
index 0000000..fda2017
--- /dev/null
+++ b/debian/bug
@@ -0,0 +1,3 @@
+cat /proc/cmdline >&3
+grep -v nodev /proc/filesystems >&3
+lsmod >&3
diff --git a/debian/changelog b/debian/changelog
index 757a015..4c773aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+initramfs-tools (0.60) unstable; urgency=low
+
+  "E ho trovato l'invasor"
+
+  * scripts/functions: Allow boot scripts to modify exported boot parameters.
+    Thanks David Härdeman <david@2gen.com> for the patch. (closes: 348147)
+    This allows the inclusion of cryptoroot hooks to cryptsetup!
+
+  * init: add cryptopts parsing and export.
+
+  * init: Move parse_numeric down to the "mounting root" block.
+
+  * init, scripts/local: Allow rootflags to be passed in kernel cmdline.
+    Thanks Thomas Luzat <thomas.luzat@gmx.net> for the patch. (closes: #358917)
+
+  * init: Allow passing nfs root mount option in kernel cmdline.  Thanks
+    Brian Brunswick <bdb@forbidden.co.uk> for the patch. (closes: #358649)
+
+  * update-initramfs: s/ALL/all/, fix it to actually run on update in non
+    verbose mode. (closes: #362568)
+
+  * update-initramfs: Warn in big letters about grub and lilo installs.
+    (closes: #362816)
+
+  * debian/bug: Add reportbug script with info about cmdline, fs and lsmod.
+
+  * initramfs-tools(8): Document the /conf/param.conf feature.
+
+  * mkinitramfs-kpkg(8): Spell out, why the wrapper script is needed.
+
+ -- maximilian attems <maks@sternwelten.at>  Tue, 18 Apr 2006 13:33:18 +0200
+
 initramfs-tools (0.59b) unstable; urgency=low
 
   * mkinitramfs-kpkg: Intialialize the variables. 
diff --git a/debian/initramfs-tools.install b/debian/initramfs-tools.install
index b722d90..9a4f31e 100644
--- a/debian/initramfs-tools.install
+++ b/debian/initramfs-tools.install
@@ -6,3 +6,4 @@ conf/initramfs.conf	etc/mkinitramfs
 hooks			usr/share/initramfs-tools
 hook-functions		usr/share/initramfs-tools
 update-initramfs	usr/sbin
+debian/bug		usr/share/bug/initramfs-tools
diff --git a/init b/init
index f69b3e8..04b7602 100755
--- a/init
+++ b/init
@@ -39,6 +39,8 @@ export readonly=y
 export resume=${RESUME}
 export rootmnt=/root
 export debug=
+export cryptopts=${CRYPTOPTS}
+
 for x in $(cat /proc/cmdline); do
 	case $x in
 	init=*)
@@ -55,8 +57,17 @@ for x in $(cat /proc/cmdline); do
 			;;
 		esac
 		;;
+	rootflags=*)
+		ROOTFLAGS="-o ${x#rootflags=}"
+		;;
+	cryptopts=*)
+		cryptopts="${x#cryptopts=}"
+		;;
 	nfsroot=*)
-		NFSROOT=${x#nfsroot=}
+		NFSROOT="${x#nfsroot=}"
+		;;
+	nfsopts=*)
+		NFSOPTS="-o ${x#nfsopts=}"
 		;;
 	boot=*)
 		BOOT=${x#boot=}
@@ -93,9 +104,6 @@ maybe_break top
 # Don't do log messages here to avoid confusing usplash
 run_scripts /scripts/init-top
 
-. /scripts/${BOOT}
-parse_numeric ${ROOT}
-
 maybe_break modules
 log_begin_msg "Loading essential drivers..."
 load_modules
@@ -108,6 +116,8 @@ log_end_msg
 
 maybe_break mount
 log_begin_msg "Mounting root file system..."
+. /scripts/${BOOT}
+parse_numeric ${ROOT}
 mountroot
 log_end_msg
 
diff --git a/initramfs-tools.8 b/initramfs-tools.8
index 991cff9..f0077ec 100644
--- a/initramfs-tools.8
+++ b/initramfs-tools.8
@@ -118,7 +118,7 @@ adds a module (and any modules which it depends on) to the initramfs image.
 .RS
 .PP
 .B Example:
-manual_add_modules reiserfs
+manual_add_modules isofs
 .RE
 
 .TP
@@ -314,6 +314,13 @@ are the last scripts to be executed before procfs and sysfs are moved to the
 real rootfs and execution is turned over to the init binary which should now be
 found in the mounted rootfs.
 
+.SS Boot parameters
+.TP
+\fB \fI
+/conf/param.conf
+allows boot scripts to change exported variables that are listed on top of init. Write the new values to it. It will be sourced after an boot script run if it exists.
+
+
 .SH EXAMPLES
 
 .SS Hook script
diff --git a/mkinitramfs-kpkg.8 b/mkinitramfs-kpkg.8
index 34f76db..0bdc1dc 100644
--- a/mkinitramfs-kpkg.8
+++ b/mkinitramfs-kpkg.8
@@ -19,9 +19,10 @@ The
 .B mkinitramfs-kpkg
 script calls
 .B mkinitramfs
-for kernel-package. It's usage is not recommended.
+as wrapper script for kernel-package. It preservers the old mkinitrd calling
+conventions. It's usage is not recommended.
 See
-.B update-initramfs
+.B update-initramfs (8)
 for an better alternative.
 
 .SH OPTIONS
diff --git a/scripts/functions b/scripts/functions
index 8cf6ddc..96a5577 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -161,6 +161,10 @@ call_scripts()
 {
 	for cs_x in ${runlist}; do
 		${initdir}/${cs_x}
+		# allow boot scripts to modify exported boot paramaters
+		if [ -e /conf/param.conf ]; then
+			. /conf/param.conf
+		fi
 	done
 }
 
diff --git a/scripts/local b/scripts/local
index dd5924d..25aca70 100644
--- a/scripts/local
+++ b/scripts/local
@@ -53,7 +53,7 @@ mountroot ()
 
 	# FIXME This has no error checking
 	# Mount root
-	mount ${roflag} -t ${FSTYPE} ${ROOT} ${rootmnt}
+	mount ${roflag} -t ${FSTYPE} ${ROOTFLAGS} ${ROOT} ${rootmnt}
 
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/log-bottom"
 	run_scripts /scripts/local-bottom
diff --git a/update-initramfs b/update-initramfs
index 9b69981..488806f 100644..100755
--- 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