* 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

@@ -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.

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
     '';
 }