diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-01-08 16:53:43 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-01-08 16:59:33 +0100 |
| commit | 71cce26342b41e92674e709a753f95eeb30aa660 (patch) | |
| tree | ca4f733a74f8795c16dc403ca474002a783402d3 /nixos/modules | |
| parent | ad26bfd316d03236181774a0245ab874703e24bd (diff) | |
| download | nixlib-71cce26342b41e92674e709a753f95eeb30aa660.tar nixlib-71cce26342b41e92674e709a753f95eeb30aa660.tar.gz nixlib-71cce26342b41e92674e709a753f95eeb30aa660.tar.bz2 nixlib-71cce26342b41e92674e709a753f95eeb30aa660.tar.lz nixlib-71cce26342b41e92674e709a753f95eeb30aa660.tar.xz nixlib-71cce26342b41e92674e709a753f95eeb30aa660.tar.zst nixlib-71cce26342b41e92674e709a753f95eeb30aa660.zip | |
nixos/udev: fix outdated udev rules for network devices
Udev changed its internal naming, so this rule file no longer applied correctly. Therefore some properties such as network driver no longer matched in systemd-networkd. After updating we have more properties in systemd-networkd: $ sudo networkctl status wlp3s0 ... Driver: iwlwifi ... To prevent this in future, the file is no copied from systemd directly
Diffstat (limited to 'nixos/modules')
| -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 18547f170a3f..000000000000 --- 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 9f42f9e59ad5..730e538e72f6 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 |