* Rename the CD modules to something more sensible.

* Make sure that reconfiguration in the live CD works properly by
  including the proper configuration module in
  /etc/nixos/configuration.nix.  Ugly.

svn path=/nixos/branches/modular-nixos/; revision=16016

modules/installer/cd-dvd/installation-cd-base.nix

@@ -13,6 +13,15 @@ let
         NixOS version number.
       '';
     };
+
+    installer.configModule = pkgs.lib.mkOption {
+      example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
+      description = ''
+        Filename of the configuration module that builds the CD
+        configuration.  Must be specified to support reconfiguration
+        in live CDs.
+      '';
+    };
   
   };
 
@@ -46,7 +55,7 @@ let
       {config, pkgs, ...}:
 
       {
-        require = [./nixos/modules/installer/cd-dvd/installation-cd.nix];
+        require = [${config.installer.configModule}];
 
         # Add your own options below and run "nixos-rebuild switch".
         # E.g.,

modules/installer/cd-dvd/installation-cd-graphical.nix

@@ -6,6 +6,8 @@
 {
   require = [./installation-cd-base.nix];
 
+  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-graphical.nix";
+
   services.xserver = {
     enable = true;
     autorun = false;

modules/installer/cd-dvd/installation-cd-minimal.nix

@@ -6,6 +6,8 @@
 {
   require = [./installation-cd-base.nix];
 
+  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
+
   # Don't include X libraries.
   services.sshd.forwardX11 = false;
   fonts.enableFontConfig = false;