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

["Luis R. Rodriguez" <mcgrof@suse.com>]

On Fri, Mar 21, 2014 at 03:34:10PM +0000, Ian Campbell wrote:
> On Wed, 2014-03-19 at 13:58 -0700, Luis R. Rodriguez wrote:
> > From: "Luis R. Rodriguez" <mcgrof@suse.com>
> This strikes me as more of a $libexec thing, what to people think (or
> does anyone want to quote LSB at me)

I see two votes in a week, enough for me to use it, will ammend.

> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Jan Rękorajski <baggins@pld-linux.org>
> > Cc: M A Young <m.a.young@durham.ac.uk>
> > Cc: Jacek Konieczny <jajcus@jajcus.net>
> > Cc: xen-devel@lists.xenproject.org
> > Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
> > ---
> >  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.

I rather have someone with NetBSD verify and then make that change.

> >  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.

It does and I tried to use the same name but if one does a git mv of a file
git adds that old file name and path to a temporary .gitignore requiring you
to use git add -f on that file. It does this because if you insist you loose
the history of the file after the move. Its also why I changed the name of
this modified init.

If you don't want to keep the history I can move forward with a mv but the
history will be lost. I did explain this in the commit log so hope is that
anyone with the same WTF reaction would understand why this as done, I know
I said WTF as well, I tried to avoid this at all costs, let me know if anyone
thinks of a better way.

What I mean by keeping the history is you can do git log --follow on the
script after the move.

> > 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?

OK, will ammend.

  Luis

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