run the Nix scripts for installing everything from the Nix built Nix.

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

fill-disk.sh

@@ -19,9 +19,6 @@ touch_file() {
 }
 root=/tmp/mnt
 
-echo mounting...
-mount -t ext2 /dev/discs/disc0/disc $root
-
 make_dir 00755 /bin
 make_dir 00755 /dev
 make_dir 00755 /proc
@@ -49,7 +46,7 @@ rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
 export NIX_ROOT=$root
-NIX_CMD_PATH=/nix/bin
+NIX_CMD_PATH=@NIX_CMD_PATH@/bin
 
 echo initialising Nix DB...
 #/nix/bin/nix-store --init

make-disk.sh

@@ -18,12 +18,15 @@ sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit'
 # Location of Nix boot scripts?
 bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -))
 
-echo "bootPath: ${bootPath}"
+#echo "bootPath: ${bootPath}"
+
+nix=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).nix' | $NIX_CMD_PATH/nix-instantiate -))
 
 cp -fa ${nixpkgs} ${archivesDir}
 mkdir ${archivesDir}/scripts
 cp -fa * ${archivesDir}/scripts
 sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
     -e "s^@bootPath\@^$bootPath^g" \
+    -e "s^@NIX_CMD_PATH\@^$nix^g" \
     < $fill_disk > $fill_disk.tmp
 mv $fill_disk.tmp $fill_disk