Merge branch 'master' into x-updates

This commit is contained in:
Vladimír Čunát 2013-06-17 22:27:53 +02:00
commit c4929aaf78

View file

@ -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