mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 23:20:55 +00:00
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 f7563698df
.
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
parent
ee29054da1
commit
1def5bad35
|
@ -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")
|
||||
|
|
Loading…
Reference in a new issue