udev: rename kernel command line option to net.ifnames=

diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 18734eed1dbe8728781a22f48c2c3895d874f9b2..77b7374886c4679e33c74fe8c90330b5f07c914f 100644 (file)
--- 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 e83eb3ff5fb6bea57dd0d823fa53c8b1201e3f68..15b5bc41072c67356539c236bbd6caf50acd1273 100644 (file)
--- 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}"