From 3cff5fb56f30a102c8af2446d237d7f132154e6f Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 10 Oct 2012 15:18:26 +0200
Subject: [PATCH] dracut*.asc: add documentation about /etc/cmdline.d/*.conf

---
 dracut.8.asc         |  3 +++
 dracut.asc           | 21 ++++++++++++---------
 dracut.cmdline.7.asc |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/dracut.8.asc b/dracut.8.asc
index 1f7100b11..3880cf642 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 cce0d800d..d24ebe6c3 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 98334b5ce..5067cf72c 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.
-- 
2.47.3