From d4a87dd5e234329600a07f4d834ad67cffa9e069 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 25 May 2009 17:52:43 +0000
Subject: [PATCH] svn path=/nixos/branches/modular-nixos/; revision=15728

---
 system/options.nix | 2 +-
 system/system.nix  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 6c81912ea33..e7fa0b8cb23 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -385,6 +385,7 @@ in
     ../etc/default.nix
     ../modules/config/fonts.nix
     ../modules/config/i18n.nix
+    ../modules/config/system-path.nix
     ../modules/config/unix-odbc-drivers.nix
     ../modules/config/users-groups.nix
     ../modules/installer/grub/grub.nix
@@ -449,7 +450,6 @@ in
     ../modules/system/upstart-events/ctrl-alt-delete.nix
     ../modules/system/upstart-events/halt.nix
     ../modules/system/upstart-events/maintenance-shell.nix
-    ../modules/config/system-path.nix
     ../system/assertion.nix
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix
diff --git a/system/system.nix b/system/system.nix
index 46804767081..489ec65d841 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -43,7 +43,6 @@ rec {
     { inherit platform; 
       configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
     config.nesting.children; 
-  configurationName = config.boot.configurationName;
 
   
   # Putting it all together.  This builds a store object containing
@@ -55,7 +54,7 @@ rec {
     name = "system";
     builder = ./system.sh;
     switchToConfiguration = ./switch-to-configuration.sh;
-    inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils upstart;
+    inherit (pkgs) grub upstart;
     grubDevice = config.boot.grubDevice;
     kernelParams =
       config.boot.kernelParams ++ config.boot.extraKernelParams;
@@ -65,7 +64,7 @@ rec {
     etc = config.system.build.etc;
     systemPath = config.system.path;
     inherit children;
-    inherit configurationName;
+    configurationName = config.boot.configurationName;
     kernel = config.boot.kernelPackages.kernel + "/vmlinuz";
     initrd = initialRamdisk + "/initrd";
     # Most of these are needed by grub-install.