X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;h=5d6092df41f231b5ed81a96b08b9bc7b12f82009;hb=ec80c7ae48c156ef33f335e51b55f897559495ad;hp=66b480a7d1073b489ce5698db8b6b4828de7a4df;hpb=73344887cd41fa1157c86ae3e1ad75e007e6e0d8;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index 66b480a..5d6092d 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -202,7 +202,8 @@ function base._addGeneratedFile function base.initFilesystem { test -z "$1" || _renameVserverCfg - { isDirectoryEmpty "$VDIR" && test ! -e "$SETUP_CONFDIR"; } || colpanic $"\ + if test -n "$OPTION_SEMIFORCE"; then + { { test -n "$OPTION_SEMIFORCE" || isDirectoryEmpty "$VDIR" 1 } && test ! -e "$SETUP_CONFDIR"; } || colpanic $"\ vserver-topdirectory '$VDIR' and/or configuration at '$SETUP_CONFDIR' exist already; please try to use '--force', or remove them manually."