summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2012-10-10 15:18:26 +0200
committerHarald Hoyer <harald@redhat.com>2012-10-10 15:25:48 +0200
commit3cff5fb56f30a102c8af2446d237d7f132154e6f (patch)
tree86b3783e0c5a8b26afe6195240a6ee6517aba545
parent3e6dad37c4b6bcc160039361949917dbad2bfe77 (diff)
downloaddracut-3cff5fb56f30a102c8af2446d237d7f132154e6f.tar.gz
dracut-3cff5fb56f30a102c8af2446d237d7f132154e6f.tar.bz2
dracut-3cff5fb56f30a102c8af2446d237d7f132154e6f.zip
dracut*.asc: add documentation about /etc/cmdline.d/*.conf
-rw-r--r--dracut.8.asc3
-rw-r--r--dracut.asc21
-rw-r--r--dracut.cmdline.7.asc2
3 files changed, 16 insertions, 10 deletions
diff --git a/dracut.8.asc b/dracut.8.asc
index 1f7100b1..3880cf64 100644
--- a/dracut.8.asc
+++ b/dracut.8.asc
@@ -422,6 +422,9 @@ _/etc/conf.d/_::
set in the configuration files.
_/etc/cmdline_::
+ Can contain additional command line options. Deprecated, better use /etc/cmdline.d/*.conf.
+
+_/etc/cmdline.d/*.conf::
Can contain additional command line options.
AVAILABILITY
diff --git a/dracut.asc b/dracut.asc
index cce0d800..d24ebe6c 100644
--- a/dracut.asc
+++ b/dracut.asc
@@ -328,25 +328,28 @@ To add your own files to the initramfs image, you have several possibilities.
The --include option let you specify a source path and a target path. For example
----
-# dracut --include cmdline-preset /etc/cmdline initramfs-cmdline-pre.img
+# dracut --include cmdline-preset /etc/cmdline.d/mycmdline.conf initramfs-cmdline-pre.img
----
will create an initramfs image, where the file cmdline-preset will be copied
-inside the initramfs to _/etc/cmdline_. --include can only be specified once.
+inside the initramfs to _/etc/cmdline.d/mycmdline.conf_. --include can only be specified once.
----
# mkdir rd.live.overlay
# mkdir rd.live.overlay/etc
# mkdir rd.live.overlay/etc/conf.d
-# echo "ip=auto" >> rd.live.overlay/etc/cmdline
-# echo export TESTVAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
-# echo export TESTVAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
+# mkdir rd.live.overlay/etc/cmdline.d
+# echo "ip=auto" >> rd.live.overlay/etc/cmdline.d/mycmdline.conf
+# echo export FOO=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
+# echo export BAR=testtest >> rd.live.overlay/etc/conf.d/testvar.conf
# tree rd.live.overlay/
rd.live.overlay/
└── etc
- ├── cmdline
- └── conf.d
- └── testvar.conf
+ ├── cmdline.d
+ │   └── mycmdline.conf
+ └── conf.d
+ └── testvar.conf
+
# dracut --include rd.live.overlay / initramfs-rd.live.overlay.img
----
@@ -393,7 +396,7 @@ server about the ip adress for the machine. The dhcp server can also serve an
additional root-path, which will set the root device for dracut. With this
mechanism, you have static configuration on your client machine and a
centralized boot configuration on your TFTP/DHCP server. If you can't pass a
-kernel command line, then you can inject _/etc/cmdline_, with a method described
+kernel command line, then you can inject _/etc/cmdline.d/mycmdline.conf_, with a method described
in <<Injecting>>.
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index 98334b5c..5067cf72 100644
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -731,7 +731,7 @@ _/etc/conf.d/_::
set in the configuration files.
_/etc/cmdline_::
- Can contain additional command line options.
+ Can contain additional command line options. Deprecated, better use /etc/cmdline.d/*.conf.
_/etc/cmdline.d/*.conf_::
Can contain additional command line options.