X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvapt-get-worker;h=048bc77efecbf520f166cabc74316ed9f5b3ac91;hb=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;hp=2efee104b439d94d1d35f1f56490934d6a669f5a;hpb=a10d81a4c1c3e164ce77336b20355364e91f24a7;p=util-vserver.git diff --git a/util-vserver/scripts/vapt-get-worker b/util-vserver/scripts/vapt-get-worker index 2efee10..048bc77 100755 --- a/util-vserver/scripts/vapt-get-worker +++ b/util-vserver/scripts/vapt-get-worker @@ -18,9 +18,9 @@ set -e -: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -40,6 +40,11 @@ pkgInit "$vserver" rpm apt createAptFileSys +test -z "$_APT_GET" || { + warning $"The environment variable \$_APT_GET is not supported anymore; please use \$APT_GET instead of" + ${APT_GET:=$_APT_GET} +} + exec ${_APT_GET:-apt-get} \ -o "RPM::RootDir=$VDIR" \ -o "Dir=$VDIR" \ @@ -49,7 +54,5 @@ exec ${_APT_GET:-apt-get} \ -o "Dir::Bin::rpm=$RPM_BINARY" \ -o "Dir::Etc=$APTETCDIR" \ -o "RPM::Order=true" \ + -o "RPM::PM=external" \ "$@" - -#export PS1='@@ ' -#exec bash