diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2021-11-02 15:27:17 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2021-12-01 15:13:16 +0100 |
| commit | 79885656d32351baf194a511aea7335296f2de94 (patch) | |
| tree | 2364763593614de71c47a6bc007d674585164997 /man/nm-initrd-generator.xml | |
| parent | af1903fe3f41acb79acfba6463615dff87abde01 (diff) | |
| download | NetworkManager-79885656d32351baf194a511aea7335296f2de94.tar.gz | |
initrd: don't add a connection if there's a connection dir with rd.neednet
Only create a default connection with rd.neednet if we're starting with
a totally blank slate. Otherwise it could be that the user already
included configuration in the initrd and merely wants us to activate it.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/999
Diffstat (limited to 'man/nm-initrd-generator.xml')
| -rw-r--r-- | man/nm-initrd-generator.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml index 503700fa80..f11be1f64b 100644 --- a/man/nm-initrd-generator.xml +++ b/man/nm-initrd-generator.xml @@ -77,6 +77,21 @@ <varlistentry> <term> <group choice='plain'> + <arg choice='plain'><option>-p</option></arg> + <arg choice='plain'><option>--persistent-connections-dir</option></arg> + </group> + <arg choice='plain'><replaceable>path</replaceable></arg> + </term> + + <listitem> + <para>Persistent connection directory. If it exists, rd.neednet will not + cause a default connection to be generated in absence of other options.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <group choice='plain'> <arg choice='plain'><option>-i</option></arg> <arg choice='plain'><option>--initrd-data-dir</option></arg> </group> |