X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvapt-get;h=012c7fe65541b44a39d67b7156b6e614291affc7;hb=d45518897217889e8571d94d4459ee12c4db56a0;hp=b4c0b5db3787363ac0cc0deeca8bb257e0b04ca1;hpb=7e1b275be82e65a1ca66daa5ca0783782cfd7686;p=util-vserver.git diff --git a/util-vserver/scripts/vapt-get b/util-vserver/scripts/vapt-get index b4c0b5d..012c7fe 100755 --- a/util-vserver/scripts/vapt-get +++ b/util-vserver/scripts/vapt-get @@ -16,9 +16,9 @@ # 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" @@ -71,7 +71,13 @@ cnt=0 res=255 for i in "${vservers[@]}"; do cnt=$[ cnt + 1 ] - "$_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