Move the generation of the dummy configuration file into the installation

device profile.

TODO: The current configuration does not reproduce exactly the CD
configuration, fix it.

svn path=/nixos/trunk/; revision=23913

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

@@ -9,13 +9,8 @@ let
 
   options = {
 
-    system.nixosVersion = mkOption {
+    # you can retrieve the profiles which have been used by looking at the
-      default = "${builtins.readFile ../../../VERSION}";
+    # list of modules use to configure the installation device.
-      description = ''
-        NixOS version number.
-      '';
-    };
-
     installer.configModule = mkOption {
       example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
       description = ''
@@ -46,27 +41,6 @@ let
 
   includeSources = true;
   
-
-  # A dummy /etc/nixos/configuration.nix in the booted CD that
-  # rebuilds the CD's configuration (and allows the configuration to
-  # be modified, of course, providing a true live CD).  Problem is
-  # that we don't really know how the CD was built - the Nix
-  # expression language doesn't allow us to query the expression being
-  # evaluated.  So we'll just hope for the best.
-  dummyConfiguration = pkgs.writeText "configuration.nix"
-    ''
-      {config, pkgs, ...}:
-
-      {
-        require = [${config.installer.configModule}];
-
-        # Add your own options below and run "nixos-rebuild switch".
-        # E.g.,
-        #   services.openssh.enable = true;
-      }
-    '';
-  
-  
 in
 
 {
@@ -104,11 +78,6 @@ in
         tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
         chown -R root.root /etc/nixos
      ''}
-
-      # Provide a configuration for the CD/DVD itself, to allow users
-      # to run nixos-rebuild to change the configuration of the
-      # running system on the CD/DVD.
-      cp ${dummyConfiguration} /etc/nixos/configuration.nix
     '';
 
   # To speed up installation a little bit, include the complete stdenv

modules/profiles/installation-device.nix

@@ -1,6 +1,71 @@
 {config, pkgs, ...}:
 
+with pkgs.lib;
+
+let
+  # Location of the repository on the harddrive
+  profilePath = toString ./.;
+
+  # Check if the path is from the NixOS repository
+  isProfile = path:
+    let s = toString path; in
+      removePrefix profilePath s != s;
+
+  # Rename NixOS modules used to setup the current device to make findable form
+  # the default location of the configuration.nix file.
+  getProfileModules =
+    map (path: "./nixos/modules/profiles" + removePrefix isProfile (toString path))
+      filter (m: isPath m && isProfile m) modules;
+
+  # A dummy /etc/nixos/configuration.nix in the booted CD that
+  # rebuilds the CD's configuration (and allows the configuration to
+  # be modified, of course, providing a true live CD).  Problem is
+  # that we don't really know how the CD was built - the Nix
+  # expression language doesn't allow us to query the expression being
+  # evaluated.  So we'll just hope for the best.
+  configClone = pkgs.writeText "configuration.nix"
+    ''
+      {config, pkgs, ...}:
+
       {
+        require = [${toString config.installer.cloneConfigIncludes}];
+
+        # Add your own options below and run "nixos-rebuild switch".
+        # E.g.,
+        #   services.openssh.enable = true;
+      }
+    '';
+in
+
+{
+  options = {
+    system.nixosVersion = mkOption {
+      default = "${builtins.readFile ../../VERSION}";
+      description = ''
+        NixOS version number.
+      '';
+    };
+
+    installer.cloneConfig = mkOption {
+      default = true;
+      description = ''
+        Try to clone the installation-device configuration by re-using it's
+        profile from the list of imported modules.
+      '';
+    };
+
+    installer.cloneConfigIncludes = mkOption {
+      default = [];
+      example = [ "./nixos/modules/hardware/network/rt73.nix" ];
+      description = ''
+        List of modules used to re-build this installation device profile.
+      '';
+    };
+  };
+
+  config = {
+    installer.cloneConfigIncludes = getProfileModules;
+
     # Show the manual.
     services.nixosManual.showManual = true;
 
@@ -22,6 +87,13 @@
       ''
         # Provide a mount point for nixos-install.
         mkdir -p /mnt
+
+        ${optionalString config.installer.cloneConfig ''
+          # Provide a configuration for the CD/DVD itself, to allow users
+          # to run nixos-rebuild to change the configuration of the
+          # running system on the CD/DVD.
+          cp ${configClone} /etc/nixos/configuration.nix
+       ''}
       '';
 
     # Some more help text.
@@ -45,4 +117,5 @@
     # Enable wpa_supplicant, but don't start it by default.
     networking.enableWLAN = true;
     jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
+  };
 }