From 45abddb069b81359bf1dacafb19786f2913028df Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 15 Dec 2011 08:50:48 +0100
Subject: [PATCH] renamed dracut.kernel.7 to dracut.cmdline.7

---
 Makefile                                    |  5 +++--
 dracut.8.xml                                | 22 +++++++++++++++++++---
 dracut.kernel.7.xml => dracut.cmdline.7.xml |  6 +++---
 dracut.conf.5.xml                           | 10 +++++++++-
 dracut.spec                                 |  1 +
 dracut.xml                                  |  6 +++---
 6 files changed, 38 insertions(+), 12 deletions(-)
 rename dracut.kernel.7.xml => dracut.cmdline.7.xml (99%)

diff --git a/Makefile b/Makefile
index ceba6cf..80ae703 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ sysconfdir ?= ${prefix}/etc
 bindir ?= ${prefix}/sbin
 mandir ?= ${prefix}/share/man
 
-manpages = dracut.8 dracut.kernel.7 dracut.conf.5 dracut-catimages.8  dracut-gencmdline.8
+manpages = dracut.8 dracut.cmdline.7 dracut.conf.5 dracut-catimages.8  dracut-gencmdline.8
 
 .PHONY: install clean archive rpm testimage test all check AUTHORS doc
 
@@ -45,7 +45,8 @@ install: doc
 	install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8
 	install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8
 	install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5
-	install -m 0644 dracut.kernel.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
+	install -m 0644 dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.cmdline.7
+	ln -s dracut.cmdline.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7
 
 clean:
 	$(RM) *~
diff --git a/dracut.8.xml b/dracut.8.xml
index b2b740a..ba8ab07 100644
--- a/dracut.8.xml
+++ b/dracut.8.xml
@@ -83,7 +83,7 @@ which are needed to access the root filesystem.</para>
     <para>
 For a complete list of kernel command line options see
       <citerefentry>
-        <refentrytitle>dracut.kernel</refentrytitle>
+        <refentrytitle>dracut.cmdline</refentrytitle>
         <manvolnum>7</manvolnum>
       </citerefentry>
 </para>
@@ -396,7 +396,23 @@ the local host instead of a generic host.
             <para>Use <filename>/etc/fstab</filename> instead of <filename>/proc/self/mountinfo</filename>.</para>
           </listitem>
         </varlistentry>
-        <varlistentry>
+	<varlistentry>
+	  <term>
+	    <option>--add_fstab;&nbsp;<replaceable>&lt;filename&gt;</replaceable>&nbsp;</option>
+	  </term>
+	  <listitem>
+	    <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
+	  </listitem>
+	  </varlistentry>
+	<varlistentry>
+	  <term>
+	    <option>--mount;&nbsp;&quot;<replaceable>&lt;device&gt;</replaceable> <replaceable>&lt;mountpoint&gt;</replaceable> <replaceable>&lt;filesystem type&gt;</replaceable> <replaceable>&lt;filesystem options&gt;</replaceable>&quot;</option>
+	  </term>
+	  <listitem>
+	    <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
+	  </listitem>
+	  </varlistentry>
+	  <varlistentry>
           <term>
             <option>-i</option>
           </term>
@@ -582,7 +598,7 @@ set in the configuration files.</para>
     <title>See Also</title>
     <para>
       <citerefentry>
-        <refentrytitle>dracut.kernel</refentrytitle>
+        <refentrytitle>dracut.cmdline</refentrytitle>
         <manvolnum>7</manvolnum>
       </citerefentry>
       <citerefentry>
diff --git a/dracut.kernel.7.xml b/dracut.cmdline.7.xml
similarity index 99%
rename from dracut.kernel.7.xml
rename to dracut.cmdline.7.xml
index 59b9433..8a49056 100644
--- a/dracut.kernel.7.xml
+++ b/dracut.cmdline.7.xml
@@ -3,7 +3,7 @@
 <!-- vim: set ts=8 sts=2 sw=2 et: -->
 <refentry id="dracutkernel7">
   <refentryinfo>
-    <title>dracut.kernel</title>
+    <title>dracut.cmdline</title>
     <productname>dracut</productname>
     <authorgroup>
       <author>
@@ -15,12 +15,12 @@
     </authorgroup>
   </refentryinfo>
   <refmeta>
-    <refentrytitle>dracut.kernel</refentrytitle>
+    <refentrytitle>dracut.cmdline</refentrytitle>
     <manvolnum>7</manvolnum>
     <refmiscinfo class="version"/>
   </refmeta>
   <refnamediv>
-    <refname>dracut.kernel</refname>
+    <refname>dracut.cmdline</refname>
     <refpurpose>dracut kernel command line options</refpurpose>
   </refnamediv>
   <refsect1>
diff --git a/dracut.conf.5.xml b/dracut.conf.5.xml
index c0766e7..b5bcdae 100644
--- a/dracut.conf.5.xml
+++ b/dracut.conf.5.xml
@@ -149,6 +149,14 @@ initramfs.</para>
       </varlistentry>
       <varlistentry>
         <term>
+          <envar>add_fstab+=&quot;&nbsp;<replaceable>&lt;filename&gt;</replaceable>&nbsp;&quot;</envar>
+        </term>
+        <listitem>
+          <para>Add entries of <replaceable>&lt;filename&gt;</replaceable> to the initramfs /etc/fstab.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
           <envar>mdadmconf=&quot;<replaceable>{yes|no}</replaceable>&quot;</envar>
         </term>
         <listitem>
@@ -263,7 +271,7 @@ The configuration files are read in alphanumerical order.</para>
         <manvolnum>8</manvolnum>
       </citerefentry>
       <citerefentry>
-        <refentrytitle>dracut.kernel</refentrytitle>
+        <refentrytitle>dracut.cmdline</refentrytitle>
         <manvolnum>7</manvolnum>
       </citerefentry>
     </para>
diff --git a/dracut.spec b/dracut.spec
index 710e154..5325ff8 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -237,6 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/dracut.conf.d
 %{_mandir}/man8/dracut.8*
 %{_mandir}/man7/dracut.kernel.7*
+%{_mandir}/man7/dracut.cmdline.7*
 %{_mandir}/man5/dracut.conf.5*
 %{dracutlibdir}/modules.d/00bootchart
 %{dracutlibdir}/modules.d/00dash
diff --git a/dracut.xml b/dracut.xml
index 8602b2f..96a2913 100644
--- a/dracut.xml
+++ b/dracut.xml
@@ -721,9 +721,9 @@ done
       <title>dracut.conf</title>
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.conf.5.xml" encoding="UTF-8" parse="xml"/>
     </section>
-    <section id="dracut.kernel">
-      <title>dracut.kernel</title>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.kernel.7.xml" encoding="UTF-8" parse="xml"/>
+    <section id="dracut.cmdline">
+      <title>dracut.cmdline</title>
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dracut.cmdline.7.xml" encoding="UTF-8" parse="xml"/>
     </section>
   </appendix>
 </book>
-- 
2.7.4