X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=82793edcbfb153ab12a2f860940913d20ec52792;hb=6e6862ddd3d654747afc7e2c953fcbc1da7c187e;hp=67e96ce136666fd503326dbe5259c071d31c696c;hpb=c89d0172ed3b485069abd1f0e4f4eac11db1d6ae;p=build.git

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 67e96ce1..82793edc 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -921,8 +921,6 @@ function main () {
 	    usage ;;
     esac
 
-    echo 'build mode=' $BUILD_MODE 'test mode=' $TEST_MODE
-
     # the set of preinstalled packages - depends on vbuild or vtest
     if [ -n "$BUILD_MODE" ] ; then
 	PREINSTALLED=devel.pkgs
@@ -949,8 +947,8 @@ function main () {
     lxc=$1 ; shift
     lxc_root=/vservers/$lxc
     # rainchecks
-    [ -d $lxc_root ] && \
-	{ echo "container $lxc already exists in filesystem - exiting" ; exit 1 ; }
+    almost_empty $lxc_root || \
+	{ echo "container $lxc already exists in $lxc_root - exiting" ; exit 1 ; }
     virsh -c lxc:/// domuuid $lxc >& /dev/null && \
 	{ echo "container $lxc already exists in libvirt - exiting" ; exit 1 ; }
     mkdir -p $lxc_root