X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvapt-get;h=012c7fe65541b44a39d67b7156b6e614291affc7;hb=9406c0030f10f1498a2fa1c4e6fca7382eba3692;hp=08200038765f741937da1769a18b44d9915dd790;hpb=b562f3d09686bb1686646c949b6f92c94eb2d64c;p=util-vserver.git diff --git a/util-vserver/scripts/vapt-get b/util-vserver/scripts/vapt-get index 0820003..012c7fe 100755 --- a/util-vserver/scripts/vapt-get +++ b/util-vserver/scripts/vapt-get @@ -1,4 +1,5 @@ #! /bin/bash +# $Id$ # Copyright (C) 2003 Enrico Scholz # @@ -15,45 +16,51 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -: ${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" . "$_LIB_FUNCTIONS" + function showHelp() { - echo "Usage: $0 * [--all] -- +" + echo \ +$"Usage: $0 * [--all] -- + + +Report bugs to <$PACKAGE_BUGREPORT>." exit $1 } function showVersion() { - cat <&2 cnt=0 res=255 -for i in $vservers; do +for i in "${vservers[@]}"; do cnt=$[ cnt + 1 ] - _APT_GET=apt-get \ - "$_NEW_NAMESPACE" "$_VAPT_GET_WORKER" "$i" "$@" + + if pkgmgmt.isInternal "$i"; then + $_VSERVER "$i" exec apt-get "$@" + else + callInNamespace "$i" \ + "$_VNAMESPACE" --new -- "$_VAPT_GET_WORKER" "$i" "$@" + fi res=$? done test "$cnt" -ge 0 || echo "No vservers specified" >&2 -exit $res \ No newline at end of file +exit $res