about summary refs log tree commit diff
path: root/man/nm-initrd-generator.xml
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2021-02-25 11:35:01 +0100
committerSebastien Bacher <seb128@ubuntu.com>2021-02-25 11:49:48 +0100
commit77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch)
tree755536a0ed1fb36c2899e9bff9e092c4008a25c4 /man/nm-initrd-generator.xml
parent47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff)
parentfd80297a396cc4dd7da4da20208fb360aa369aa7 (diff)
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'man/nm-initrd-generator.xml')
-rw-r--r--man/nm-initrd-generator.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml
index 37f5ffdf..fcfb54fe 100644
--- a/man/nm-initrd-generator.xml
+++ b/man/nm-initrd-generator.xml
@@ -105,6 +105,20 @@
       <varlistentry>
         <term>
           <group choice='plain'>
+            <arg choice='plain'><option>-r</option></arg>
+            <arg choice='plain'><option>--run-config-dir</option></arg>
+          </group>
+          <arg choice='plain'><replaceable>path</replaceable></arg>
+        </term>
+
+        <listitem>
+          <para>Output directory for config files.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <group choice='plain'>
             <arg choice='plain'><option>-s</option></arg>
             <arg choice='plain'><option>--stdout</option></arg>
           </group>
@@ -133,6 +147,7 @@
             <member><option>rd.peerdns</option></member>
             <member><option>rd.bootif</option></member>
             <member><option>rd.net.timeout.dhcp</option></member>
+            <member><option>rd.net.timeout.carrier</option></member>
             <member><option>BOOTIF</option></member>
           </simplelist>