From 97a4e1fcb3db3c74f510a075d6748e1ecdb7f118 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 10:03:58 +0000
Subject: [PATCH] * 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     | 11 ++++++++++-
 ...ation-cd-big.nix => installation-cd-graphical.nix} |  2 ++
 ...ation-cd-small.nix => installation-cd-minimal.nix} |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)
 rename modules/installer/cd-dvd/{installation-cd-big.nix => installation-cd-graphical.nix} (76%)
 rename modules/installer/cd-dvd/{installation-cd-small.nix => installation-cd-minimal.nix} (76%)

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index 18300f01ee93..76ac3b5d3cc9 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/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.,
diff --git a/modules/installer/cd-dvd/installation-cd-big.nix b/modules/installer/cd-dvd/installation-cd-graphical.nix
similarity index 76%
rename from modules/installer/cd-dvd/installation-cd-big.nix
rename to modules/installer/cd-dvd/installation-cd-graphical.nix
index fada3cd1017a..5f600022dce7 100644
--- a/modules/installer/cd-dvd/installation-cd-big.nix
+++ b/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;
diff --git a/modules/installer/cd-dvd/installation-cd-small.nix b/modules/installer/cd-dvd/installation-cd-minimal.nix
similarity index 76%
rename from modules/installer/cd-dvd/installation-cd-small.nix
rename to modules/installer/cd-dvd/installation-cd-minimal.nix
index 7b0103f9ada5..2b3e4bf04b65 100644
--- a/modules/installer/cd-dvd/installation-cd-small.nix
+++ b/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;