about summary refs log tree commit diff
path: root/man/NetworkManager.xml
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2019-01-25 10:52:15 +0100
committerSebastien Bacher <seb128@ubuntu.com>2019-01-25 11:24:27 +0100
commite8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch)
tree017883e210043859ee695250f6285380b795f8e4 /man/NetworkManager.xml
parentb05c072fe2594e0369cbfb00a3fba176d2d309dc (diff)
parent1b878e595ff7be634a4800ca6cc506046e49548e (diff)
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'man/NetworkManager.xml')
-rw-r--r--man/NetworkManager.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index 7b0513bb..f78a44f4 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -380,6 +380,13 @@
         </para></listitem>
       </varlistentry>
       <varlistentry>
+        <term><arg choice='plain'><option>--configure-and-quit</option></arg><arg>initrd</arg></term>
+        <listitem><para>Quit after all devices reach a stable state.
+        The optional <literal>initrd</literal> parameter enables mode, where no
+        processes are left running after NetworkManager stops, which is useful
+        for running from an initial ramdisk on rearly boot.</para></listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>--plugins</option></term>
         <listitem><para>List plugins used to manage system-wide
         connection settings.  This list has preference over plugins