X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;fp=scripts%2Fvserver-build.functions;h=5d6092df41f231b5ed81a96b08b9bc7b12f82009;hb=35370e2d11f661d780b71204d61439e31b91fb57;hp=eadef2f021c78f943b44ddf04cc0799154ae2491;hpb=be41237a12dad904d92e58373f670113bb730a24;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index eadef2f..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" 1 && 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."