summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2014-12-05 17:32:46 +0100
committerLuca Bruno <lucabru@src.gnome.org>2014-12-05 17:33:23 +0100
commitcbd30b2bde17a87075138cf0443f110e5ac0e373 (patch)
treea3a77837957f656807ca3a555c7ae765ba5af0e1 /nixos
parentb8e33a5dcbf5ce0ebd154d2f13a377313cf41985 (diff)
parentee0f81de5ef04d8ef54041e022c25f820bbb7bc1 (diff)
downloadnixpkgs-cbd30b2bde17a87075138cf0443f110e5ac0e373.tar
nixpkgs-cbd30b2bde17a87075138cf0443f110e5ac0e373.tar.gz
nixpkgs-cbd30b2bde17a87075138cf0443f110e5ac0e373.tar.bz2
nixpkgs-cbd30b2bde17a87075138cf0443f110e5ac0e373.tar.lz
nixpkgs-cbd30b2bde17a87075138cf0443f110e5ac0e373.tar.xz
nixpkgs-cbd30b2bde17a87075138cf0443f110e5ac0e373.tar.zst
nixpkgs-cbd30b2bde17a87075138cf0443f110e5ac0e373.zip
Merge PR #5235, fix predictable network interfaces
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.nix2
2 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/hardware/80-net-name-slot.rules b/nixos/modules/services/hardware/80-net-setup-link.rules
index 18547f170a3..18547f170a3 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 2a6f4cfb4e3..39180f4d37e 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -88,7 +88,7 @@ let
       done
 
       ${optionalString config.networking.usePredictableInterfaceNames ''
-        cp ${./80-net-name-slot.rules} $out/80-net-name-slot.rules
+        cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules
       ''}
 
       # If auto-configuration is disabled, then remove