From 135240e05ffad48431afdd220d3e7bf2bb619fe5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Jun 2009 12:51:16 +0000
Subject: [PATCH] * Sigh.  The nix-env call has to come after nix-store
 --load-db.   Should really allow an ordering between postBootCommands.

svn path=/nixos/branches/modular-nixos/; revision=15923
---
 modules/installer/cd-dvd/installation-cd.nix | 5 -----
 modules/installer/cd-dvd/iso-image.nix       | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd.nix b/modules/installer/cd-dvd/installation-cd.nix
index acb62db01cf..4f38ebfc796 100644
--- a/modules/installer/cd-dvd/installation-cd.nix
+++ b/modules/installer/cd-dvd/installation-cd.nix
@@ -170,11 +170,6 @@ in
       # to run nixos-rebuild to change the configuration of the
       # running system on the CD/DVD.
       cp ${dummyConfiguration} /etc/nixos/configuration.nix
-
-      # nixos-rebuild also requires a "system" profile and an
-      # /etc/NIXOS tag.
-      touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
     '';
 
   # Some more help text.
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index d17106cde32..d7d346bd264 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -150,5 +150,10 @@ in
     ''
       ${config.environment.nix}/bin/nix-store --load-db < /nix-path-registration
       rm /nix-path-registration
+
+      # nixos-rebuild also requires a "system" profile and an
+      # /etc/NIXOS tag.
+      touch /etc/NIXOS
+      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
     '';
 }