X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=07d01ab1517249424232f37f6ce2b272dce36242;hb=8726ddd8aaa179f00d1fedf18a76251c807df94f;hp=6033307f47f7aca7f239ba7579a2337f1ad300ae;hpb=311f1f92344b4a9e950649b134b11debbec6ae71;p=sliceimage.git

diff --git a/vserver-reference.init b/vserver-reference.init
index 6033307..07d01ab 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -2,12 +2,13 @@
 #
 # Builds VServer reference image. Requires the web and boot servers to
 # be up, which complicates bootstrap. Alternatively, we could require
-# the build server to host a local yum repository.
+# the build server to host a local yum repository. Already, it is
+# required to run the same major version of yum as the nodes.
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2005 The Trustees of Princeton University
 #
-# $Id: vserver-reference.init,v 1.8 2005/03/31 22:34:42 mlhuang Exp $
+# $Id: vserver-reference.init,v 1.13 2005/09/01 17:51:26 mlhuang Exp $
 #
 
 YUM_CONF="http://www.planet-lab.org/PlanetLabConf/v3-yum.conf"
@@ -48,7 +49,7 @@ mkdir -p $VROOT/proc
 mount -t proc none $VROOT/proc
 
 # Clean up before exiting if anything goes wrong
-trap "umount $VROOT/proc ; umount $VROOT/dev/pts" ERR
+trap "umount $VROOT/proc ; umount $VROOT/dev/pts ; exit 255" ERR
 
 # Create a dummy /etc/fstab in reference image
 mkdir -p $VROOT/etc
@@ -102,7 +103,7 @@ umount $VROOT/dev/pts
 MAKEDEV
 
 # Disable all services in reference image
-chroot $VROOT /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off"
+/usr/sbin/chroot $VROOT /bin/sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off"
 
 # Clean up
 umount $VROOT/proc