Changeset 2704

Show
Ignore:
Timestamp:
03/16/08 04:30:22 (8 months ago)
Author:
dhozac
Message:

Fix vserver ... stop --rescue-init.
Use it in stopSleepingGuest, to prevent races and to do proper cleanup.
If vserver ... stop has already been invoked, remove SC_HELPER from the context.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/scripts/vserver-build.functions

    r2701 r2704  
    283283{ 
    284284    local guest="$1" 
    285     $_VKILL --xid "$guest" -s INT -- 1 
    286 } 
     285    $_VSERVER "$guest" stop --rescue-init 
     286} 
  • trunk/scripts/vserver.stop

    r2692 r2704  
    5151while test "$#" -gt 0; do 
    5252    case "$1" in 
    53         (--rescue-init) _IS_FAKEINIT=1;; 
     53        (--rescue-init) shift; _IS_FAKEINIT=1;; 
    5454        (--)            shift; break;; 
    5555        (-*)            panic $"vserver ... stop: unknown option '$1'";; 
     
    7070 
    7171test -z "$OPTION_DEFAULTTTY" || setDefaultTTY "$VSERVER_DIR" 
     72 
     73$_VATTRIBUTE --set --xid "$S_CONTEXT" --flag !SC_HELPER 
    7274 
    7375fail=