X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.init;h=c8170e4a917095219a487ffc32c033323c6a872f;hb=39ebc061d62e884542c8e5076a6359636f2bdd7f;hp=94d890325731aa17a01af96919146e020e7363e9;hpb=87c76b60554fad32d00fe01de821dea7d9bf0f8a;p=vserver-reference.git

diff --git a/vserver-reference.init b/vserver-reference.init
index 94d8903..c8170e4 100755
--- a/vserver-reference.init
+++ b/vserver-reference.init
@@ -9,7 +9,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004 The Trustees of Princeton University
 #
-# $Id: vserver-reference.init,v 1.4 2004/10/29 20:29:13 mlhuang Exp $
+# $Id: vserver-reference.init,v 1.6 2004/11/17 22:54:19 mlhuang Exp $
 #
 
 case "$1" in
@@ -41,7 +41,7 @@ exec &>/var/log/vserver-reference.log
 # Make /vservers
 mkdir -p $VROOTDIR
 chmod 000 $VROOTDIR
-chattr +t $VROOTDIR
+$PKGLIBDIR/setattr --barrier $VROOTDIR
 
 # Build image in /vservers/.vtmp
 mkdir -p $VROOTDIR/.vtmp
@@ -49,13 +49,12 @@ VROOT=$(mktemp -d $VROOTDIR/.vtmp/vserver-reference.XXXXXX)
 
 # Make /vservers/.vtmp/vserver-reference.XXXXXX
 mkdir -p $VROOT
-chattr -t $VROOT
 chmod 755 $VROOT
 
 echo -n $"Building VServer reference: " >&3 2>&4
 
 # Clean up before exiting if anything goes wrong
-trap "umount $VROOT/proc ; umount $VROOT/dev/pts ; chattr -R -i $VROOT ; rm -rf $VROOT ; failure >&3 2>&4 ; echo >&3 2>&4 ; exit 255" ERR
+trap "umount $VROOT/proc ; umount $VROOT/dev/pts ; rm -rf $VROOT ; failure >&3 2>&4 ; echo >&3 2>&4 ; exit 255" ERR
 
 MAKEDEV ()
 {
@@ -111,9 +110,6 @@ fi
 # Install RPMs in reference image
 yum $SSLCERTDIR --installroot=$VROOT -y groupinstall VServer
 
-# Remove stale RPM locks
-rm -f $VROOT/var/lib/rpm/__db*
-
 # Clean up /dev in reference image
 umount $VROOT/dev/pts
 MAKEDEV