public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into x-updates

This commit is contained in:
Vladimír Čunát 2013-06-17 22:27:53 +02:00
parent d85ec960d1 9e1e995cbe
commit c4929aaf78
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/installer/cd-dvd/system-tarball.nix
View File

@ -72,9 +72,6 @@ in
inherit (config.tarball) contents storeContents; inherit (config.tarball) contents storeContents;
}; };
# Otherwise it will collide with the 'ip=dhcp' kernel autoconfig.
networking.useDHCP = false;
boot.postBootCommands = boot.postBootCommands =
'' ''
# After booting, register the contents of the Nix store on the # After booting, register the contents of the Nix store on the