mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-05 11:44:02 +00:00
Merge branch 'master' into x-updates
This commit is contained in:
commit
c4929aaf78
@ -72,9 +72,6 @@ in
|
||||
inherit (config.tarball) contents storeContents;
|
||||
};
|
||||
|
||||
# Otherwise it will collide with the 'ip=dhcp' kernel autoconfig.
|
||||
networking.useDHCP = false;
|
||||
|
||||
boot.postBootCommands =
|
||||
''
|
||||
# After booting, register the contents of the Nix store on the
|
||||
|
Loading…
Reference in New Issue
Block a user