diff options
author | lethalman <lucabru@src.gnome.org> | 2014-12-02 10:50:16 +0100 |
---|---|---|
committer | lethalman <lucabru@src.gnome.org> | 2014-12-02 10:50:16 +0100 |
commit | ddeee82b314505a02752d03c91696b491d41986f (patch) | |
tree | 01d88a6b83d1b4c3e0103571eba9a0b24fa9d634 /nixos | |
parent | 75ead8812b6bfb7b5193c6f487562bc9af0dd334 (diff) | |
parent | d0327c052cb7c5c685bb392e658e25e918fca535 (diff) | |
download | nixlib-ddeee82b314505a02752d03c91696b491d41986f.tar nixlib-ddeee82b314505a02752d03c91696b491d41986f.tar.gz nixlib-ddeee82b314505a02752d03c91696b491d41986f.tar.bz2 nixlib-ddeee82b314505a02752d03c91696b491d41986f.tar.lz nixlib-ddeee82b314505a02752d03c91696b491d41986f.tar.xz nixlib-ddeee82b314505a02752d03c91696b491d41986f.tar.zst nixlib-ddeee82b314505a02752d03c91696b491d41986f.zip |
Merge pull request #5184 from daogames/tb/fix-systemd-udev-net-rules
Fix filename for udev network interface rules
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/hardware/80-net-setup-link.rules (renamed from nixos/modules/services/hardware/80-net-name-slot.rules) | 0 | ||||
-rw-r--r-- | nixos/modules/services/hardware/udev.nix | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/hardware/80-net-name-slot.rules b/nixos/modules/services/hardware/80-net-setup-link.rules index 18547f170a3f..18547f170a3f 100644 --- a/nixos/modules/services/hardware/80-net-name-slot.rules +++ b/nixos/modules/services/hardware/80-net-setup-link.rules diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 2a6f4cfb4e37..c9e3b8a855a6 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -87,8 +87,8 @@ let grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true done - ${optionalString config.networking.usePredictableInterfaceNames '' - cp ${./80-net-name-slot.rules} $out/80-net-name-slot.rules + ${optionalString (! config.networking.usePredictableInterfaceNames) '' + cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules ''} # If auto-configuration is disabled, then remove |