- 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

1 files changed, 41 insertions, 9 deletions

diff --git a/initramfs-tools.8 b/initramfs-tools.8
index 0950b39..7af09e1 100644
--- a/initramfs-tools.8
+++ b/initramfs-tools.8
@@ -1,4 +1,4 @@
-.TH INITRAMFS-TOOLS 8  "Date: 2005/12/06" "" "mkinitramfs script overview"
+.TH INITRAMFS-TOOLS 8  "Date: 2006/08/19" "" "mkinitramfs script overview"
 
 .SH NAME
 initramfs-tools \- an introduction to writing scripts for mkinitramfs
@@ -29,18 +29,44 @@ arguments which influence the boot procedure:
 
 .SS Boot options
 
+The init and root are usually passed by the boot loader for local boot.
+The other parameters are optional.
+
 .TP
 \fB \fI init
 the binary to hand over execution to on the root fs after the initramfs scripts are done.
 
 .TP
 \fB \fI root
-the device node to mount as the rootfs.
+the device node to mount as the root file system.
+
+.TP
+\fB \fI rootdelay
+set delay in seconds. Determines how long mountroot waits for root to appear.
+
+.TP
+\fB \fI rootflags
+set the file system mount option string.
+
+.TP
+\fB \fI rootfstype
+set the root file system type.
 
 .TP
 \fB \fI nfsroot
 can be either "auto" to try to get the relevant information from DHCP or a
-string of the form NFSSERVER:NFSPATH
+string of the form NFSSERVER:NFSPATH or NFSSERVER:NFSPATH:NFSOPTS.
+Use root=/dev/nfs for NFS to kick to in.
+
+.TP
+\fB \fI ip
+tells how to configure the ip adress. Allows to specify an different
+NFS server than the DHCP server. See Documentation/nfsroot.txt in
+any recent linux source for details. Optional paramater for NFS root.
+
+.TP
+\fB \fI cryptopts
+passes the args for cryptoroot. Set by the cryptsetup boot hooks.
 
 .TP
 \fB \fI boot
@@ -50,27 +76,33 @@ either local or NFS (affects which initramfs scripts are run, see the "Subdirect
 \fB \fI resume
 On install initramfs-tools tries to autodetect the resume partition. On success
 the RESUME variable is written to /etc/initramfs-tools/conf.d/resume.
-The boot variable overrides it.
+The boot variable noresume overrides it.
 
 .TP
 \fB \fI quiet
-reduces the amount of text output to the console during boot
+reduces the amount of text output to the console during boot.
 
 .TP
 \fB \fI ro
-mounts the rootfs read-only
+mounts the rootfs read-only.
 
 .TP
 \fB \fI rw
-mounts the rootfs read-write
+mounts the rootfs read-write.
+
+.TP
+\fB \fI panic
+sets an timeout on panic. Currently only zero value supported.
 
 .TP
 \fB \fI debug
-generates lots of output to /tmp/initramfs.debug
+generates lots of output to /tmp/initramfs.debug.
 
 .TP
 \fB \fI break
 spawns a shell in the initramfs image at chosen run-time
+(top, modules, premount, mount, bottom, init).
+The default is premount without any arg.
 
 
 .SH HOOK SCRIPTS
@@ -404,7 +436,7 @@ to double-check if it contains the relevant binaries, libs or modules:
 .nf
 mkdir tmp/initramfs
 cd tmp/initramfs
-gunzip -c -9 /boot/initrd.img-2.6.15-1-686 | \\
+gunzip -c -9 /boot/initrd.img-2.6.17-2-686 | \\
 cpio -i -d -H newc --no-absolute-filenames
 .fi
 .RE