X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvapt-get-worker;h=9161dcfc3cc1518fe89b7b4269b65e32be0fb29e;hb=373b4ae34d8bdceba301d34ed739e973dc896b14;hp=260381e83a1832fd037116de121578d2d40f4dd2;hpb=b562f3d09686bb1686646c949b6f92c94eb2d64c;p=util-vserver.git diff --git a/util-vserver/scripts/vapt-get-worker b/util-vserver/scripts/vapt-get-worker index 260381e..9161dcf 100755 --- a/util-vserver/scripts/vapt-get-worker +++ b/util-vserver/scripts/vapt-get-worker @@ -1,4 +1,4 @@ -#! /bin/bash -e +#! /bin/bash # $Id$ # Copyright (C) 2003 Enrico Scholz @@ -16,10 +16,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +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; aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -39,15 +40,14 @@ pkgInit "$vserver" rpm apt createAptFileSys -$_APT_GET -o "RPM::RootDir=$VDIR" \ - -o "Dir=$VDIR" \ - -o "Dir::State=$APTSTATEDIR" \ - -o "Dir::Cache=$APTCACHEDIR" \ - -o "Dir::Cache::archives=$APTARCHIVDIR" \ - -o "Dir::Bin::rpm=$RPM_BINARY" \ - -o "Dir::Etc=$APTETCDIR" \ - -o "RPM::Order=true" \ - "$@" - -export PS1='@@ ' -exec bash +exec ${_APT_GET:-apt-get} \ + -o "RPM::RootDir=$VDIR" \ + -o "Dir=$VDIR" \ + -o "Dir::State=$APTSTATEDIR" \ + -o "Dir::Cache=$APTCACHEDIR" \ + -o "Dir::Cache::archives=$APTARCHIVDIR" \ + -o "Dir::Bin::rpm=$RPM_BINARY" \ + -o "Dir::Etc=$APTETCDIR" \ + -o "RPM::Order=true" \ + -o "RPM::PM=external" \ + "$@"