From 5a33334b8ad49798510a2ce29e451194c6ecb618 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 18 Mar 2013 19:31:34 +0100 Subject: udev: rename kernel command line option to net.ifnames= --- man/systemd-udevd.service.xml | 7 +++---- 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 @@ - net.predictable-names= - rd.net.predictable-names= + net.ifnames= - Rename network interfaces to give them predictable names - when possible. Defaults to 1. + Network interfaces are renamed to give them predictable names + when possible. It is enabled by default, specifying 0 disables it. 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}" -- cgit v1.2.3-54-g00ecf