diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-12-02 10:54:48 +0100 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-12-02 10:54:48 +0100 |
| commit | 41cb91a4fd2cc6232aa1661a2cffd36343a56ef9 (patch) | |
| tree | edf0cbd9104282a77303b19555fa442692eb7b79 /nixos | |
| parent | ddeee82b314505a02752d03c91696b491d41986f (diff) | |
| download | nixlib-41cb91a4fd2cc6232aa1661a2cffd36343a56ef9.tar nixlib-41cb91a4fd2cc6232aa1661a2cffd36343a56ef9.tar.gz nixlib-41cb91a4fd2cc6232aa1661a2cffd36343a56ef9.tar.bz2 nixlib-41cb91a4fd2cc6232aa1661a2cffd36343a56ef9.tar.lz nixlib-41cb91a4fd2cc6232aa1661a2cffd36343a56ef9.tar.xz nixlib-41cb91a4fd2cc6232aa1661a2cffd36343a56ef9.tar.zst nixlib-41cb91a4fd2cc6232aa1661a2cffd36343a56ef9.zip | |
Revert "Merge pull request #5184 from daogames/tb/fix-systemd-udev-net-rules"
This reverts commit ddeee82b314505a02752d03c91696b491d41986f, reversing changes made to 75ead8812b6bfb7b5193c6f487562bc9af0dd334.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/hardware/80-net-name-slot.rules (renamed from nixos/modules/services/hardware/80-net-setup-link.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-setup-link.rules b/nixos/modules/services/hardware/80-net-name-slot.rules index 18547f170a3f..18547f170a3f 100644 --- a/nixos/modules/services/hardware/80-net-setup-link.rules +++ b/nixos/modules/services/hardware/80-net-name-slot.rules diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index c9e3b8a855a6..2a6f4cfb4e37 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-setup-link.rules} $out/80-net-setup-link.rules + ${optionalString config.networking.usePredictableInterfaceNames '' + cp ${./80-net-name-slot.rules} $out/80-net-name-slot.rules ''} # If auto-configuration is disabled, then remove |