From f848833a2cdd09d5e4e5d94b5ddf67cf271dd980 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Mon, 5 Feb 2007 18:08:17 +0000 Subject: [PATCH] fix vsomething arguments in gentoo wrappers git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2486 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- scripts/vdispatch-conf | 2 +- scripts/vesync | 6 ++---- scripts/vupdateworld | 12 +++++++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/vdispatch-conf b/scripts/vdispatch-conf index c767cd8..d1da389 100755 --- a/scripts/vdispatch-conf +++ b/scripts/vdispatch-conf @@ -69,4 +69,4 @@ VSOMETHING_PKGMGMT=1 export VSOMETHING_TITLE VSOMETHING_PKGMGMT -exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" +exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "$@" diff --git a/scripts/vesync b/scripts/vesync index 6418239..1107205 100755 --- a/scripts/vesync +++ b/scripts/vesync @@ -75,17 +75,15 @@ VSOMETHING_PKGMGMT=1 export VSOMETHING_TITLE VSOMETHING_PKGMGMT -test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) - ret=0 test $overlay_only -eq 0 && \ - $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --metadata + $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" -- --metadata ret=$? test -n "$overlay" -a -n "$overlay_host" && \ - $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" \ + $_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "$@" -- \ -rtW --progress --delete --delete-after "${overlay_host}/" "${overlay}/" test $? -eq 0 -a $ret -eq 0 diff --git a/scripts/vupdateworld b/scripts/vupdateworld index ee5f202..0ce3e5a 100755 --- a/scripts/vupdateworld +++ b/scripts/vupdateworld @@ -64,10 +64,20 @@ while true; do shift done +declare -a vserver_names + +while [ $# -gt 0 ]; do + case "$1" in + (--) shift; break;; + (*) vserver_names=( "${vserver_names[@]}" "$1" );; + esac + shift +done + VSOMETHING_TITLE=vemerge VSOMETHING_PKGMGMT=1 export VSOMETHING_TITLE VSOMETHING_PKGMGMT test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) -exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" world --update --deep --newuse "$@" +exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@" -- 1.8.1.5