Merge branch 'master' into x-updates

2013-06-17 22:27:53 +02:00
parent d85ec960d1 9e1e995cbe
commit c4929aaf78
1 changed files with 0 additions and 3 deletions
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -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