diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-01-09 01:24:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 01:24:02 +0100 |
| commit | 470f5ef40932321f09936d64888d8652d43b880c (patch) | |
| tree | 80b64ae582afdd16ac7f27797035f598e9512343 | |
| parent | d273f02cd194ad3f12cedf9aa89f51d4c4a36f46 (diff) | |
| parent | 71cce26342b41e92674e709a753f95eeb30aa660 (diff) | |
| download | nixpkgs-470f5ef40932321f09936d64888d8652d43b880c.tar nixpkgs-470f5ef40932321f09936d64888d8652d43b880c.tar.gz nixpkgs-470f5ef40932321f09936d64888d8652d43b880c.tar.bz2 nixpkgs-470f5ef40932321f09936d64888d8652d43b880c.tar.lz nixpkgs-470f5ef40932321f09936d64888d8652d43b880c.tar.xz nixpkgs-470f5ef40932321f09936d64888d8652d43b880c.tar.zst nixpkgs-470f5ef40932321f09936d64888d8652d43b880c.zip | |
Merge pull request #33617 from Mic92/udevd
nixos/udev: fix outdated udev rules for network devices
| -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, 1 insertions, 14 deletions
diff --git a/nixos/modules/services/hardware/80-net-setup-link.rules b/nixos/modules/services/hardware/80-net-setup-link.rules deleted file mode 100644 index 18547f170a3..00000000000 --- a/nixos/modules/services/hardware/80-net-setup-link.rules +++ /dev/null @@ -1,13 +0,0 @@ -# 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 9f42f9e59ad..730e538e72f 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 ${./80-net-setup-link.rules} $out/80-net-setup-link.rules + cp ${udev}/lib/udev/rules.d/80-net-setup-link.rules $out/80-net-setup-link.rules ''} # If auto-configuration is disabled, then remove |