diff options
| author | Adarsh J <adarshaj@gmail.com> | 2021-01-18 03:15:14 +0900 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-01-20 16:10:56 +0100 |
| commit | e300138892ee0fc3824d38b527b60103a01758ab (patch) | |
| tree | dbb260861f8f190635a00defd2112e5b1e18f480 /man | |
| parent | 3096d31155142396098d313cbd8f5f3fbe31e328 (diff) | |
| download | NetworkManager-e300138892ee0fc3824d38b527b60103a01758ab.tar.gz | |
initrd: add support for rd.net.timeout.carrier
Add support for `carrier-wait-timeout` setting from kernel cmdline.
This will create a new `15-carrier-timeout.conf` file in
/run/NetworkManager/conf.d with the parameter value as specified.
The setting also inserts `match-device` to `*`, matching all devices.
NB: The parameter on kernel cmdline is specified in seconds. This is
done to be backwards compatible with with network-legacy module. However
the generated setting will automatically multiply specified value by
1000 and store timeout value in ms.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/626
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/730
Diffstat (limited to 'man')
| -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 37f5ffdf4b..fcfb54fe50 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> |