From ce718ec3cd9f5c3761b3b32c58af2d5053287b76 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 30 Nov 2007 14:49:01 +0000 Subject: [PATCH] cleaned up the clone logic --- vbuild-init-vserver.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh index 5bf728a2..e1482891 100755 --- a/vbuild-init-vserver.sh +++ b/vbuild-init-vserver.sh @@ -76,19 +76,14 @@ function setup_vserver () { fcdistro=$1; shift personality=$1; shift - CLONED=0 - # create the new vserver - if [ ! -d /etc/vservers/$vserver ] ; then - # check if we can create the vserver from a reference vserver - #if [ -d /vservers/${fcdistro}_reference ] ; then - if [ 0 -ne 0 -a -n "$VBUILD_MODE" ] ; then - $personality vserver $VERBOSE $vserver build -m clone -- --source /vservers/${fcdistro}_reference - CLONED=1 - else - $personality vserver $VERBOSE $vserver build -m yum -- -d $fcdistro - fi + if [ -d /etc/vservers/$vserver ] ; then + echo "$COMMAND : vserver $vserver seems to exist - bailing out" + exit 1 fi + # create it + $personality vserver $VERBOSE $vserver build -m yum -- -d $fcdistro + if [ ! -z "$personality" ] ; then l32=$(grep $personality /etc/vservers/$vserver/personality | wc -l) [ $l32 -eq 0 ] && echo $personality >> /etc/vservers/$vserver/personality -- 2.43.0