From 4b333e0f67caa765feec052d79804f4520221bb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 8 Nov 2006 09:31:45 +0000
Subject: [PATCH] * Add the installer and rsync to the path.

svn path=/nixu/trunk/; revision=6979
---
 test/installer.nix     |  1 +
 test/installer.sh      |  2 +-
 test/rescue-system.nix | 16 +++++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/test/installer.nix b/test/installer.nix
index 1560e6654897..d960bab1bb14 100644
--- a/test/installer.nix
+++ b/test/installer.nix
@@ -3,6 +3,7 @@
 
 genericSubstituter {
   src = ./installer.sh;
+  dir = "bin";
   isExecutable = true;
   inherit shell nix;
   
diff --git a/test/installer.sh b/test/installer.sh
index c2742e9018eb..a823a2b76a42 100644
--- a/test/installer.sh
+++ b/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
 
diff --git a/test/rescue-system.nix b/test/rescue-system.nix
index e4147b153f5e..4e22ecb4d899 100644
--- a/test/rescue-system.nix
+++ b/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";