Re: [Xen-devel] [PATCH 1/3] init/sysconfig scripts: Remove --halt/-H option for shutdown command.

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2012-10-11 at 10:05 +0100, Christoph Egger wrote:
> On 10/11/12 10:52, Ian Campbell wrote:
> > On Thu, 2012-10-11 at 09:25 +0100, linux@xxxxxxxxxxxxxx wrote:
> >> From: Sander Eikelenboom <linux@xxxxxxxxxxxxxx>
> >>
> >> The --halt/-H option for the shutdown command is now pointless,
> >> since linux in a guest treats "halt" and "poweroff" identically.
> > 
> > This looks good to me but I'd just like to confirm that Free&NetBSD also
> > treat them the same before I commit it.
> 
> shutdown in NetBSD never had a --halt option.
> shutdown runs the shutdown procedure and halts the system.
> shutdown -p runs the shutdown procedure and then powers off the system.

Thanks, I've acked + applied this now.

Ian.


> 
> Christoph
> 
> > 
> > Ian.
> > 
> >> The option is not implemented in xl / libxl and if supplied causes the 
> >> command
> >> to fail , so remove it from the init and sysconfig scripts.
> >>
> >> Signed-off-by: Sander Eikelenboom <linux@xxxxxxxxxxxxxx>
> >> ---
> >>  tools/hotplug/Linux/init.d/sysconfig.xendomains |   12 ++++++------
> >>  tools/hotplug/Linux/init.d/xendomains           |    4 ++--
> >>  tools/hotplug/NetBSD/rc.d/xendomains            |    2 +-
> >>  3 files changed, 9 insertions(+), 9 deletions(-)
> >>
> >> diff --git a/tools/hotplug/Linux/init.d/sysconfig.xendomains 
> >> b/tools/hotplug/Linux/init.d/sysconfig.xendomains
> >> index e590d3f..4775277 100644
> >> --- a/tools/hotplug/Linux/init.d/sysconfig.xendomains
> >> +++ b/tools/hotplug/Linux/init.d/sysconfig.xendomains
> >> @@ -56,29 +56,29 @@ XENDOMAINS_MIGRATE=""
> >>  XENDOMAINS_SAVE=/var/lib/xen/save
> >>  
> >>  ## Type: string
> >> -## Default: "--halt --wait"
> >> +## Default: "--wait"
> >>  #
> >>  # If neither MIGRATE nor SAVE were enabled or if they failed, you can
> >>  # try to shut down a domain by sending it a shutdown request. To do this,
> >> -# set this to "--halt --wait". Omit the "--wait" flag to avoid waiting
> >> +# set this to "--wait". Omit the "--wait" flag to avoid waiting
> >>  # for the domain to be really down. Leave empty to skip domain shutdown.
> >>  #
> >> -XENDOMAINS_SHUTDOWN="--halt --wait"
> >> +XENDOMAINS_SHUTDOWN="--wait"
> >>  
> >>  ## Type: string
> >> -## Default: "--all --halt --wait"
> >> +## Default: "--all --wait"
> >>  #
> >>  # After we have gone over all virtual machines (resp. all automatically
> >>  # started ones, see XENDOMAINS_AUTO_ONLY below) in a loop and sent SysRq,
> >>  # migrated, saved and/or shutdown according to the settings above, we
> >>  # might want to shutdown the virtual machines that are still running
> >>  # for some reason or another. To do this, set this variable to
> >> -# "--all --halt --wait", it will be passed to xm shutdown.
> >> +# "--all --wait", it will be passed to xm shutdown.
> >>  # Leave it empty not to do anything special here.
> >>  # (Note: This will hit all virtual machines, even if XENDOMAINS_AUTO_ONLY
> >>  # is set.)
> >>  # 
> >> -XENDOMAINS_SHUTDOWN_ALL="--all --halt --wait"
> >> +XENDOMAINS_SHUTDOWN_ALL="--all --wait"
> >>  
> >>  ## Type: boolean
> >>  ## Default: true
> >> diff --git a/tools/hotplug/Linux/init.d/xendomains 
> >> b/tools/hotplug/Linux/init.d/xendomains
> >> index c033581..c363208 100644
> >> --- a/tools/hotplug/Linux/init.d/xendomains
> >> +++ b/tools/hotplug/Linux/init.d/xendomains
> >> @@ -434,7 +434,7 @@ stop()
> >>        fi
> >>    fi
> >>    if test -n "$XENDOMAINS_SHUTDOWN"; then
> >> -      # XENDOMAINS_SHUTDOWN should be "--halt --wait"
> >> +      # XENDOMAINS_SHUTDOWN should be "--wait"
> >>        echo -n "(shut)"
> >>        watchdog_xencmd shutdown &
> >>        WDOG_PID=$!
> >> @@ -453,7 +453,7 @@ stop()
> >>      # This is because it's easier to do ;-) but arguably if this script 
> >> is run
> >>      # on system shutdown then it's also the right thing to do.
> >>      if ! all_zombies && test -n "$XENDOMAINS_SHUTDOWN_ALL"; then
> >> -  # XENDOMAINS_SHUTDOWN_ALL should be "--all --halt --wait"
> >> +  # XENDOMAINS_SHUTDOWN_ALL should be "--all --wait"
> >>    echo -n " SHUTDOWN_ALL "
> >>    watchdog_xencmd shutdown 1 false &
> >>    WDOG_PID=$!
> >> diff --git a/tools/hotplug/NetBSD/rc.d/xendomains 
> >> b/tools/hotplug/NetBSD/rc.d/xendomains
> >> index c368c58..3e62038 100644
> >> --- a/tools/hotplug/NetBSD/rc.d/xendomains
> >> +++ b/tools/hotplug/NetBSD/rc.d/xendomains
> >> @@ -94,7 +94,7 @@ xendomains_stop()
> >>    #
> >>    echo "Stopping xen domains."
> >>    for domain in $(xendomains_list); do
> >> -          ${ctl_command} shutdown --halt $domain
> >> +          ${ctl_command} shutdown $domain
> >>    done
> >>    while [ $timeout -gt 0 ]; do
> >>            livedomains=$(xendomains_list)
> > 
> > 
> > 
> 
> 



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel