X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build.functions;h=fcde3fa52392d6b646909a639f003b66a7be47ef;hb=957c8385551257aec49f9eb1cdbb7b9e8084a053;hp=b12a5d5792e9b82d63f7dad61037cbd8597318a8;hpb=66ff8eb2e4f7e51fab7bf0eae4a756c9f54b7132;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build.functions b/util-vserver/scripts/vserver-build.functions index b12a5d5..fcde3fa 100644 --- a/util-vserver/scripts/vserver-build.functions +++ b/util-vserver/scripts/vserver-build.functions @@ -127,6 +127,9 @@ function getDistribution elif test -e /etc/debian_version; then set -- $(cat /etc/debian_version) DISTRIBUTION=deb$1 + elif test -e /etc/SuSE-release; then + set -- $(cat /etc/SuSE-release) + DISTRIBUTION=suse$3 else echo \ "Can not determine distribution; please specify it manually @@ -141,8 +144,9 @@ function base.initFilesystem test -z "$1" || _renameVserverCfg test ! -d "$VDIR" -a ! -d "$SETUP_CONFDIR" || { echo \ -"vserver-topdirectory and/or configuration exist already; -please try to use '--force', or remove them manually" >&2 +"vserver-topdirectory '$VDIR' and/or configuration at '$SETUP_CONFDIR' +exist already; please try to use '--force', or remove them manually" +>&2 exit 1 } >&2