X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.sh;h=b9c3244e22fc99bd9a2444e5ab3f3490815b29bb;hb=8ce8e636bb61dbf6fd7abef99f94d3ef89df8e88;hp=81b5dd8d82e1684ef2983227c22fc6572f94fc7b;hpb=39482298a78eed38819f83eea7ce00638e6c17d0;p=vserver-reference.git

diff --git a/build.sh b/build.sh
index 81b5dd8..b9c3244 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: build.sh,v 1.16 2007/06/25 19:52:27 deisenst Exp $
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -24,7 +24,7 @@ fi
 export PATH
 
 # Release and architecture to install
-releasever=2
+releasever=4
 basearch=i386
 
 # Packages to install
@@ -48,6 +48,7 @@ traceroute
 time
 vixie-cron
 wget
+which
 yum
 curl
 gzip
@@ -84,14 +85,14 @@ done
 set -e
 
 # Make /vservers
-vroot=$PWD/vservers/vserver-reference
+vroot=$PWD/vservers/.vref/default
 install -d -m 755 $vroot
 
-# Install vserver-reference system
+# Install default reference image
 for package in "${packagelist[@]}" ; do
     packages="$packages -p $package"
 done
-mkfedora -v -r $releasever -a $basearch $packages $vroot
+mkfedora -v -r $releasever -a $basearch -k $packages $vroot
 
 # Clean /dev
 rm -rf $vroot/dev
@@ -104,7 +105,7 @@ mknod -m 644 $vroot/dev/urandom c 1 9
 mknod -m 666 $vroot/dev/tty c 5 0
 mknod -m 666 $vroot/dev/ptmx c 5 2
 # For bash command substitution
-ln -nsf ../proc/self/fd /dev/fd
+ln -nsf ../proc/self/fd $vroot/dev/fd
 # For df and linuxconf
 touch $vroot/dev/hdv1
 # For TUN/TAP