Re: [Xen-devel] [PATCH v2 6/7] tools/xendomains: move to sbin and use init helper

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2014-03-19 at 13:58 -0700, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <mcgrof@xxxxxxxx>
> 
> The xendomains script can be resued with systemd systems as it

"reused"
> does not control services or sockets per se, but does a one shot
> scrape of domUs it needs start bring up, stop, reload so we're
> going to resue it.

"reuse"

This strikes me as more of a $libexec thing, what to people think (or
does anyone want to quote LSB at me)

> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> Cc: Jan RÄkorajski <baggins@xxxxxxxxxxxxx>
> Cc: M A Young <m.a.young@xxxxxxxxxxxx>
> Cc: Jacek Konieczny <jajcus@xxxxxxxxxx>
> Cc: xen-devel@xxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx>
> ---
>  tools/hotplug/Linux/Makefile                |  4 +++-
>  tools/hotplug/Linux/init.d/xendomains-init  | 33 
> +++++++++++++++++++++++++++++
>  tools/hotplug/Linux/{init.d => }/xendomains |  0

For some reason we also have tools/hotplug/NetBSD/rc.d/xendomains. I
presume there is a non-zero chance that it could call this new tool as
well.

>  3 files changed, 36 insertions(+), 1 deletion(-)
>  create mode 100644 tools/hotplug/Linux/init.d/xendomains-init
>  rename tools/hotplug/Linux/{init.d => }/xendomains (100%)
> 
> diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
> index 47655f6..0be2e8a 100644
> --- a/tools/hotplug/Linux/Makefile
> +++ b/tools/hotplug/Linux/Makefile
> @@ -3,7 +3,8 @@ include $(XEN_ROOT)/tools/Rules.mk
>  
>  # Init scripts.
>  XEND_INITD = init.d/xend
> -XENDOMAINS_INITD = init.d/xendomains
> +XENDOMAINS_INITD = init.d/xendomains-init

The suffix is unnecessary given the directory, isn't it? Plus it avoids
upgrade hassle by not changing the name of the initscript.

> +XENDOMAINS_SBIN = xendomains
>  XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
>  
>  XENCOMMONS_INITD = init.d/xencommons
> @@ -50,6 +51,7 @@ install-initd:
>  ifeq ($(CONFIG_XEND),y)
>       $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(INITD_DIR)
>  endif
> +     $(INSTALL_PROG) $(XENDOMAINS_SBIN) $(DESTDIR)$(SBINDIR)
>       $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR)
>       $(INSTALL_DATA) $(XENDOMAINS_SYSCONFIG) 
> $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
>       $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR)
> diff --git a/tools/hotplug/Linux/init.d/xendomains-init 
> b/tools/hotplug/Linux/init.d/xendomains-init
> new file mode 100644
> index 0000000..da55932
> --- /dev/null
> +++ b/tools/hotplug/Linux/init.d/xendomains-init
> @@ -0,0 +1,33 @@
> +#!/bin/bash
> +#
> +# /etc/init.d/xendomains-init
> +#
> +# wrapper for starting / stopping domains automatically when domain
> +# 0 boots / shuts down on systems using init. The $SBINDIR/xendomains
> +# helper is shared between init and systemd systems.

Shouldn't all the LSB headers from the original sit around here
somewhere?

Ian.


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