Make vserver ... rpm/apt-get/apt-cache/apt-config work again.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Thu, 28 Sep 2006 15:10:29 +0000 (15:10 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Thu, 28 Sep 2006 15:10:29 +0000 (15:10 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2335 94cd875c-1c1d-0410-91d2-eb244daf1a30

scripts/vapt-get
scripts/vserver

index 490f9ac..aa0f4fe 100755 (executable)
@@ -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[@]}" "$@"
index e3f1484..545206d 100755 (executable)
@@ -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)