X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2F80-net-name-slot.rules;h=c5f1b3885b0e5c4402ed9d155d8a277d0652fc1e;hp=e83eb3ff5fb6bea57dd0d823fa53c8b1201e3f68;hb=2a73e0d39a9bec82c3800071e375d27164727e71;hpb=0cf2d0d023389957f57175c9cfb6aba56c0df343 diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules index e83eb3ff5..c5f1b3885 100644 --- a/rules/80-net-name-slot.rules +++ b/rules/80-net-name-slot.rules @@ -1,13 +1,11 @@ # do not edit this file, it will be overwritten on update -ACTION=="remove", GOTO="net_name_slot_end" +ACTION!="add", 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}"