X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;h=e423e5c4d0ff72b2703767b8bc759160d45a24bb;hb=036b3a89556ef244feea9156ed3381e29a3e7e6a;hp=eadef2f021c78f943b44ddf04cc0799154ae2491;hpb=909fa999c0180aba479959080bd434ad98930c49;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index eadef2f..e423e5c 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -202,7 +202,7 @@ function base._addGeneratedFile function base.initFilesystem { test -z "$1" || _renameVserverCfg - { isDirectoryEmpty "$VDIR" 1 && test ! -e "$SETUP_CONFDIR"; } || colpanic $"\ + { { 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."