From fe7d06dd8c87ef290962b1f14b9eb3e41d4a1f0d Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Thu, 28 Sep 2006 15:10:29 +0000 Subject: [PATCH] Make vserver ... rpm/apt-get/apt-cache/apt-config work again. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2335 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- scripts/vapt-get | 2 +- scripts/vserver | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/vapt-get b/scripts/vapt-get index 490f9ac..aa0f4fe 100755 --- a/scripts/vapt-get +++ b/scripts/vapt-get @@ -71,4 +71,4 @@ VSOMETHING_PKGMGMT=1 export VSOMETHING_TITLE VSOMETHING_WORKER VSOMETHING_PKGMGMT test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) -exec $_VSOMETHING "${send_through[@]}" apt-get "${vsomething_opts[@]}" "$@" +exec $_VSOMETHING "${send_through[@]}" ${APT_GET:-apt-get} "${vsomething_opts[@]}" "$@" diff --git a/scripts/vserver b/scripts/vserver index e3f1484..545206d 100755 --- a/scripts/vserver +++ b/scripts/vserver @@ -257,12 +257,14 @@ case "$2" in ;; (apt-get|apt-config|apt-cache) - export _APT_GET=$2 + export APT_GET=$2 shift 2 - exec $_VAPT_GET -- "$@" + exec $_VAPT_GET "$VSERVER_DIR" -- "$@" ;; + (rpm) - exec $_VRPM -- "$@" + shift 2 + exec $_VRPM "$VSERVER_DIR" -- "$@" ;; (status) -- 1.8.1.5