From 41cb91a4fd2cc6232aa1661a2cffd36343a56ef9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Dec 2014 10:54:48 +0100 Subject: [PATCH] Revert "Merge pull request #5184 from daogames/tb/fix-systemd-udev-net-rules" This reverts commit ddeee82b314505a02752d03c91696b491d41986f, reversing changes made to 75ead8812b6bfb7b5193c6f487562bc9af0dd334. --- .../{80-net-setup-link.rules => 80-net-name-slot.rules} | 0 nixos/modules/services/hardware/udev.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename nixos/modules/services/hardware/{80-net-setup-link.rules => 80-net-name-slot.rules} (100%) diff --git a/nixos/modules/services/hardware/80-net-setup-link.rules b/nixos/modules/services/hardware/80-net-name-slot.rules similarity index 100% rename from nixos/modules/services/hardware/80-net-setup-link.rules rename to 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 c9e3b8a855a..2a6f4cfb4e3 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