libnl is needed first.

[build.git] / vbuild-init-vserver.sh

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 5bf728a..8b97c0f 100755 (executable)
--- 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
@@ -106,11 +101,10 @@ function setup_vserver () {
        [ $cap -eq 0 ] && echo 'CAP_IPC_LOCK' >> /etc/vservers/$vserver/bcapabilities
     fi
 
+    $personality vyum $vserver -- -y install yum
+    $personality vserver $VERBOSE $vserver pkgmgmt internalize
+
     # start the vserver so we can do the following operations
-    if [ $CLONED -eq 0 ] ; then
-       $personality vyum $vserver -- -y install yum
-       $personality vserver $VERBOSE $vserver pkgmgmt internalize
-    fi
     $personality vserver $VERBOSE $vserver start
     $personality vserver $VERBOSE $vserver exec rm -f /var/lib/rpm/__db*
     $personality vserver $VERBOSE $vserver exec rpm --rebuilddb