diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-03-18 19:31:34 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-03-18 19:31:34 +0100 |
| commit | 5a33334b8ad49798510a2ce29e451194c6ecb618 (patch) | |
| tree | 51d02bb20af71e6fd71f723b81a122d0801633ab | |
| parent | 08cbc57e87b19277568c6f7d038c460d9063775f (diff) | |
udev: rename kernel command line option to net.ifnames=
| -rw-r--r-- | man/systemd-udevd.service.xml | 7 | ||||
| -rw-r--r-- | rules/80-net-name-slot.rules | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index 18734eed1d..77b7374886 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -155,11 +155,10 @@ </listitem> </varlistentry> <varlistentry> - <term><varname>net.predictable-names=</varname></term> - <term><varname>rd.net.predictable-names=</varname></term> + <term><varname>net.ifnames=</varname></term> <listitem> - <para>Rename network interfaces to give them predictable names - when possible. Defaults to 1.</para> + <para>Network interfaces are renamed to give them predictable names + when possible. It is enabled by default, specifying 0 disables it.</para> </listitem> </varlistentry> </variablelist> diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules index e83eb3ff5f..15b5bc4107 100644 --- a/rules/80-net-name-slot.rules +++ b/rules/80-net-name-slot.rules @@ -4,10 +4,8 @@ ACTION=="remove", GOTO="net_name_slot_end" SUBSYSTEM!="net", GOTO="net_name_slot_end" NAME!="", GOTO="net_name_slot_end" -IMPORT{cmdline}="net.predictable-names" -ENV{net.predictable-names}=="0", GOTO="net_name_slot_end" -IMPORT{cmdline}="rd.net.predictable-names" -ENV{rd.net.predictable-names}=="0", TEST=="/etc/initrd-release", GOTO="net_name_slot_end" +IMPORT{cmdline}="net.ifnames" +ENV{net.ifnames}=="0", GOTO="net_name_slot_end" NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}" NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}" |