X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver-build.functions;h=e423e5c4d0ff72b2703767b8bc759160d45a24bb;hb=01a0c0794f07d3950dee13ac1b03f8625d5ad318;hp=55ee0438185be95c9272f44d907b2b60c551369f;hpb=ae8f5839c759113a738c058b90344ab54cfda3cf;p=util-vserver.git diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index 55ee043..e423e5c 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -155,6 +155,9 @@ function getDistribution if test -e /etc/fedora-release; then set -- $(cat /etc/fedora-release) DISTRIBUTION=fdr$4 + elif test -e /etc/mandrake-release; then + set -- $(cat /etc/mandrake-release) + DISTRIBUTION=mdv$4 elif test -e /etc/redhat-release; then set -- $(cat /etc/redhat-release) DISTRIBUTION=rh$5 @@ -199,7 +202,7 @@ function base._addGeneratedFile function base.initFilesystem { test -z "$1" || _renameVserverCfg - { isDirectoryEmpty "$VDIR" && 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."