* Add the installer and rsync to the path.

svn path=/nixu/trunk/; revision=6979

test/installer.nix

@@ -3,6 +3,7 @@
 
 genericSubstituter {
   src = ./installer.sh;
+  dir = "bin";
   isExecutable = true;
   inherit shell nix;
   

test/installer.sh

@@ -37,5 +37,5 @@ mount "$targetDevice" $mountPoint || exit 1
 
 # Copy Nix to the Nix store on the target device.
 mkdir -p $mountPoint/nix/store/
-cp -prd $(cat @nixClosure@) $mountPoint/nix/store/ || exit 1
+rsync -av $(cat @nixClosure@) $mountPoint/nix/store/ || exit 1
 

test/rescue-system.nix

@@ -60,6 +60,13 @@ rec {
   };
 
 
+  # The installer.
+  nixosInstaller = import ./installer.nix {
+    inherit (pkgs) stdenv genericSubstituter nix;
+    shell = pkgs.bash + "/bin/sh";
+  };
+
+
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
@@ -92,19 +99,14 @@ rec {
       pkgs.procps
       pkgs.shadowutils
       pkgs.sysklogd
+      pkgs.rsync
+      nixosInstaller
     ];
 
     mingetty = pkgs.mingettyWrapper;
   };
 
 
-  # The installer.
-  nixosInstaller = import ./installer.nix {
-    inherit (pkgs) stdenv genericSubstituter nix;
-    shell = pkgs.bash + "/bin/sh";
-  };
-
-
   # Since the CD is read-only, the mount points must be on disk.
   cdMountPoints = pkgs.stdenv.mkDerivation {
     name = "mount-points";