From 1accc5f143b60a13472f5cb540e1d33c67e000b8 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Mon, 29 Nov 2004 20:19:13 +0000 Subject: [PATCH] - PL3118 and PL3131 fix: set barrier bit on /vservers instead of old immulink bit. Do not reset the immutable bit on the new vserver-reference directory when deleting it after an error. --- vserver-reference.init | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vserver-reference.init b/vserver-reference.init index 4e9566f..c8170e4 100755 --- a/vserver-reference.init +++ b/vserver-reference.init @@ -9,7 +9,7 @@ # Mark Huang # Copyright (C) 2004 The Trustees of Princeton University # -# $Id: vserver-reference.init,v 1.5 2004/11/17 22:50:04 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 () { -- 2.43.0