X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;h=e423e5c4d0ff72b2703767b8bc759160d45a24bb;hb=dbbb75087e2a59a419e8c3ef76458f3262dfe8cd;hp=5d6092df41f231b5ed81a96b08b9bc7b12f82009;hpb=35370e2d11f661d780b71204d61439e31b91fb57;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index 5d6092d..e423e5c 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -202,8 +202,7 @@ function base._addGeneratedFile function base.initFilesystem { test -z "$1" || _renameVserverCfg - if test -n "$OPTION_SEMIFORCE"; then - { { test -n "$OPTION_SEMIFORCE" || 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."