* Substitute the path of the system derivation directly in the stage 2

  init script.  This removes the need for the `systemConfig' boot
  parameter; `init=<stage-2-init>' is enough.  However, the GRUB menu
  builder still needs to add `systemConfig' to the kernel command line
  for compatibility with old configurations.

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

1 files changed, 4 insertions, 6 deletions

diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 15ac3449207..8117d8631f5 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -174,11 +174,9 @@ in
   # Closures to be copied to the Nix store on the CD, namely the init
   # script and the top-level system configuration directory.
   isoImage.storeContents =
-    [ config.system.build.bootStage2
-      config.system.build.toplevel
-    ] ++ 
-    (optional config.isoImage.includeSystemBuildDependencies
-      config.system.build.toplevel.drvPath);
+    [ config.system.build.toplevel ] ++ 
+    optional config.isoImage.includeSystemBuildDependencies
+      config.system.build.toplevel.drvPath;
 
   # Create the squashfs image that contains the Nix store.
   system.build.squashfsStore = import ../../../lib/make-squashfs.nix {
@@ -220,7 +218,7 @@ in
   boot.loader.grub.extraEntries =
     ''
       menuentry "NixOS Installer / Rescue" {
-        linux /boot/bzImage init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} ${toString config.boot.kernelParams}
+        linux /boot/bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
         initrd /boot/initrd
       }