From 200251da1a131ee18576cedeacfb845fa5e94af6 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 19 Jul 2005 16:00:34 +0000
Subject: [PATCH] fix tpyos

svn path=/nixu/trunk/; revision=3367
---
 fill-disk.sh | 2 +-
 make-disk.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 57459727b9b6..1e3a4e2938cd 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -75,7 +75,7 @@ echo copying nixpkgs...
 cp -fa ../pkgs $root/nixpkgs/trunk
 
 make_dir 0755 /tmp/scripts
-cp -fa ../scripts $/tmp/scripts
+cp -fa ../scripts $root/tmp/scripts
 
 echo adding manifest
 $NIX_CMD_PATH/nix-pull $manifest
diff --git a/make-disk.sh b/make-disk.sh
index 71aa79394957..1f6d177d2f1d 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -11,8 +11,8 @@ rm -rf ${archivesDir}/*
 NIX_CMD_PATH=/nix/bin
 
 storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -)
-#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
-$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $storeExpr $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
+#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $storeExpr $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
 
 # Location of sysvinit?
 sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -))