Skip to content

Commit

Permalink
Revert "Use the new net.ifnames kernel command line flag to disable p…
Browse files Browse the repository at this point in the history
…ersistent 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 f756369.

Signed-off-by: Shea Levy <[email protected]>
  • Loading branch information
shlevy committed Apr 3, 2013
1 parent ee29054 commit 1def5ba
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions modules/services/hardware/udev.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit 1def5ba

Please sign in to comment.