From 38ebcd013a1d1a6c3198102c09075baf94cbf1da Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 14 Apr 2004 23:29:49 +0000 Subject: [PATCH] fixed another brokeness in CLI option handling git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1461 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/scripts/vshelper | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/util-vserver/scripts/vshelper b/util-vserver/scripts/vshelper index 5ccc6df..538d210 100755 --- a/util-vserver/scripts/vshelper +++ b/util-vserver/scripts/vshelper @@ -146,17 +146,18 @@ fi this_xid=$($_VSERVER_INFO - XID) pxid= +responsible_xid=$XID while true; do - pxid=$($_VSERVER_INFO "$XID" PXID) || break - test "$pxid" -ne "$this_xid" || break - xid=$pxid + pxid=$($_VSERVER_INFO "$responsible_xid" PXID) || break + test "$pxid" -ne "$this_xid" || break + xid=$responsible_xid done -vserver_id=$($_VSERVER_INFO "$XID" ID) || - panic $"No responsible vserver found for xid '$1' ($XID); aborting..." +vserver_id=$($_VSERVER_INFO "$responsible_xid" ID) || + panic $"No responsible vserver found for resonsible xid '$responsible_xid' ($XID); aborting..." -test "$1" = "$XID" || { - logging "Giving 'vshelper' task for '$1' to parent vserver '$vserver_id' ($XID)" +test "$XID" = "$responsible_xid" || { + logging "Giving 'vshelper' task for '$XID' to parent vserver '$vserver_id' ($responsible_xid)" execute $_VSERVER "$vserver_id" exec $_VSHELPER "$@" } -- 1.8.1.5