summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--initramfs.conf.55
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4c0ff66..d413936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+initramfs-tools (0.89) unstable; urgency=low
+
+ * initramfs.conf.5: Document ROOT hardcoding.
+
+ -- maximilian attems <maks@debian.org> Wed, 30 May 2007 13:25:36 +0200
+
initramfs-tools (0.88) unstable; urgency=low
[ maximilian attems ]
diff --git a/initramfs.conf.5 b/initramfs.conf.5
index c7fee03..d6c3f0e 100644
--- a/initramfs.conf.5
+++ b/initramfs.conf.5
@@ -59,6 +59,11 @@ Set to \fInfs\fP for an NFS root share.
Specifies the network interface, like eth0.
.TP
+\fB ROOT
+Allows optional root bootarg hardcoding, when no root bootarg can be passed.
+A root bootarg overrides that special setting.
+
+.TP
\fB NFSROOT
Defaults to \fIauto\fP in order to pick up value from DHCP server.
Otherwise you need to specify \fIHOST:MOUNT\fP.