From f763a7c40ade67009759562e79fbb0c9050b4431 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 9 Nov 2004 10:28:21 +0000
Subject: [PATCH] change to new packages, with new nix, new bash, new
 everything! It's shiny and new!

svn path=/nixu/trunk/; revision=1730
---
 fill-disk.sh | 8 +++++---
 make-disk.sh | 4 ++--
 pkgs.nix     | 2 +-
 run.sh       | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index 0873badcff8..969dfea25bf 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -49,7 +49,9 @@ rm -f $root/etc/mtab
 ln -s /proc/mounts $root/etc/mtab
 
 export NIX_ROOT=$root
-NIX_CMD_PATH=/usr/home/nix/.nix-profile/bin
+#NIX_CMD_PATH=/usr/home/nix/.nix-profile/bin
+#NIX_CMD_PATH=/home/armijn/.nix-profile/bin
+NIX_CMD_PATH=/nix/bin
 
 echo initialising Nix DB...
 #/nix/bin/nix-store --init
@@ -65,13 +67,13 @@ echo registering valid paths...
         (unset NIX_ROOT; $NIX_CMD_PATH/nix-store --dump $storepath) | $NIX_CMD_PATH/nix-store --restore $storepath
         $NIX_CMD_PATH/nix-store --validpath $storepath
     fi
-done) < /tmp/storepaths
+done) < /tmp/mystorepaths
 
 echo registering successors...
 (while read line; do
     echo SUCC $line
     $NIX_CMD_PATH/nix-store --successor $line
-done) < /tmp/successors
+done) < /tmp/mysuccessors
 
 echo setting init symlink...
 rm -f $root/init
diff --git a/make-disk.sh b/make-disk.sh
index 87e761110cd..9ea97636bbd 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -2,8 +2,8 @@
 
 image=/tmp/disk.img
 size=$(expr 2048 \* 1024 \* 1024)
-storePaths=/tmp/storepaths
-successors=/tmp/successors
+storePaths=/tmp/mystorepaths
+successors=/tmp/mysuccessors
 
 if ! test -f $image; then 
 
diff --git a/pkgs.nix b/pkgs.nix
index cb80054bca3..5660e111f37 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -1,5 +1,5 @@
 rec {
-  inherit (import /usr/home/nix/nixpkgs-0.6pre1121/pkgs/system/i686-linux.nix)
+  inherit (import /home/armijn/pkgs/system/i686-linux.nix)
     stdenv bash coreutils findutils utillinux sysvinit e2fsprogs
     nettools nix subversion gcc wget which vim less screen openssh binutils
     strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip;
diff --git a/run.sh b/run.sh
index 50728feca25..e6ec1e005e2 100755
--- a/run.sh
+++ b/run.sh
@@ -3,5 +3,5 @@
 image=/tmp/disk.img
 
 linux ubd0="$image" mem=256M \
-  eth0=tuntap,tap1,,192.168.150.3 \
+  eth0=tuntap,tap1 \
   init="/init"