diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-01-11 11:07:59 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-01-11 11:21:16 +0000 |
| commit | 788c5195f36fe101ecbf016137e017655063bc6b (patch) | |
| tree | 8c799368a76205cfff218ad2e7464bd12dcb8462 /nixos | |
| parent | 18ca43f3393d8df0d330b8bb8a75e7b18e24f076 (diff) | |
Revert "nixos/udev: fix outdated udev rules for network devices"
This reverts commit 45c5a915980fbe1fa6f0ff80ab2d11b60b844d9e. This breaks PredictableNetworkInterfaceNames on systems without networkd. We should only include this file from systemd, when networkd is enabled.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/hardware/80-net-setup-link.rules | 13 | ||||
| -rw-r--r-- | nixos/modules/services/hardware/udev.nix | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/80-net-setup-link.rules b/nixos/modules/services/hardware/80-net-setup-link.rules new file mode 100644 index 0000000000000..18547f170a3f9 --- /dev/null +++ b/nixos/modules/services/hardware/80-net-setup-link.rules @@ -0,0 +1,13 @@ +# Copied from systemd 203. +ACTION=="remove", GOTO="net_name_slot_end" +SUBSYSTEM!="net", GOTO="net_name_slot_end" +NAME!="", 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}" +NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}" + +LABEL="net_name_slot_end" diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 730e538e72f61..9f42f9e59ad5e 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -119,7 +119,7 @@ let fi ${optionalString config.networking.usePredictableInterfaceNames '' - cp ${udev}/lib/udev/rules.d/80-net-setup-link.rules $out/80-net-setup-link.rules + cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules ''} # If auto-configuration is disabled, then remove |