From 1def5bad35b45a56d0e21f5c8304df416fbdd7cf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 3 Apr 2013 07:35:35 -0400 Subject: [PATCH] Revert "Use the new net.ifnames kernel command line flag to disable persistent interface names" As @edolstra pointed out, this behavior is not equivalent to what we had before as the kernel command line parameter won't take effect until the next boot. Probably it's not likely that someone will make this change and then add a network card before rebooting, but might as well support that since we can. This reverts commit f7563698dfcc4621cc996142b046c6a4941e68ec. Signed-off-by: Shea Levy --- modules/services/hardware/udev.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix index 90ff26da91fee..3bec396bfe579 100644 --- a/modules/services/hardware/udev.nix +++ b/modules/services/hardware/udev.nix @@ -83,6 +83,10 @@ let grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true done + ${optionalString (!config.networking.usePredictableInterfaceNames) '' + ln -s /dev/null $out/80-net-name-slot.rules + ''} + # If auto-configuration is disabled, then remove # udev's 80-drivers.rules file, which contains rules for # automatically calling modprobe. @@ -218,8 +222,6 @@ in } ]; - boot.extraKernelParams = mkIf (! config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ]; - system.requiredKernelConfig = with config.lib.kernelConfig; [ (isEnabled "UNIX") (isYes "INOTIFY_USER")