Re: [Xen-devel] [PATCH for-xen-4.5] tools/hotplug: use configure --sysconfdir result

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

You forgot to add the release manager... I've done that for you.

In <1413279117.1497.25.camel@xxxxxxxxxx> I said:
> Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> 
> Is this a bug fix or a feature? What are the risks? IsLKonrad OK with
> it?

On Wed, 2014-11-12 at 12:06 +0100, Olaf Hering wrote:
> Ping?
> 
> 
> > ... instead of hardcoding values and guess where they config files may
> > be. Also use the result of --with-sysconfig-leaf-dir.
> > 
> > Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
> > Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
> > Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> > Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> > Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> > ---
> >  tools/hotplug/Linux/init.d/xencommons.in                          | 6 
> > +-----
> >  tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in            | 3 +--
> >  tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in | 3 +--
> >  tools/hotplug/Linux/systemd/xenconsoled.service.in                | 3 +--
> >  tools/hotplug/Linux/systemd/xenstored.service.in                  | 3 +--
> >  tools/hotplug/Linux/xendomains.in                                 | 6 
> > +-----
> >  6 files changed, 6 insertions(+), 18 deletions(-)
> > 
> > diff --git a/tools/hotplug/Linux/init.d/xencommons.in 
> > b/tools/hotplug/Linux/init.d/xencommons.in
> > index d53a1f3..a1095c2 100644
> > --- a/tools/hotplug/Linux/init.d/xencommons.in
> > +++ b/tools/hotplug/Linux/init.d/xencommons.in
> > @@ -23,11 +23,7 @@ BACKEND_MODULES="@LINUX_BACKEND_MODULES@"
> >  
> >  . @XEN_SCRIPT_DIR@/hotplugpath.sh
> >  
> > -if [ -d /etc/sysconfig ]; then
> > -   xencommons_config=/etc/sysconfig
> > -else
> > -   xencommons_config=/etc/default
> > -fi
> > +xencommons_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@
> >  
> >  test -f $xencommons_config/xencommons && . $xencommons_config/xencommons
> >  
> > diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in 
> > b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in
> > index 44dfce8..1e930ed 100644
> > --- a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in
> > +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in
> > @@ -5,8 +5,7 @@ RefuseManualStop=true
> >  
> >  [Mount]
> >  Environment=XENSTORED_MOUNT_CTX=none
> > -EnvironmentFile=-/etc/sysconfig/xenstored
> > -EnvironmentFile=-/etc/default/xenstored
> > +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored
> >  What=xenstore
> >  Where=@XEN_LIB_STORED@
> >  Type=tmpfs
> > diff --git 
> > a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in 
> > b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
> > index d3470fc..2282923 100644
> > --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
> > +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
> > @@ -8,8 +8,7 @@ ConditionVirtualization=xen
> >  
> >  [Service]
> >  Type=simple
> > -EnvironmentFile=-/etc/default/xenstored
> > -EnvironmentFile=-/etc/sysconfig/xenstored
> > +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored
> >  PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid
> >  ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
> >  ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
> > diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in 
> > b/tools/hotplug/Linux/systemd/xenconsoled.service.in
> > index 7ca0264..377f131 100644
> > --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in
> > +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in
> > @@ -9,8 +9,7 @@ Type=simple
> >  Environment=XENCONSOLED_ARGS=
> >  Environment=XENCONSOLED_LOG=none
> >  Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console
> > -EnvironmentFile=-/etc/default/xenconsoled
> > -EnvironmentFile=-/etc/sysconfig/xenconsoled
> > +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled
> >  PIDFile=@XEN_RUN_DIR@/xenconsoled.pid
> >  ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
> >  ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR}
> > diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in 
> > b/tools/hotplug/Linux/systemd/xenstored.service.in
> > index 013e69e..f85b37d 100644
> > --- a/tools/hotplug/Linux/systemd/xenstored.service.in
> > +++ b/tools/hotplug/Linux/systemd/xenstored.service.in
> > @@ -11,8 +11,7 @@ Type=notify
> >  Environment=XENSTORED_ARGS=
> >  Environment=XENSTORED_ROOTDIR=@XEN_LIB_STORED@
> >  Environment=XENSTORED=@XENSTORED@
> > -EnvironmentFile=-/etc/default/xencommons
> > -EnvironmentFile=-/etc/sysconfig/xencommons
> > +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons
> >  ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
> >  ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb*
> >  ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
> > diff --git a/tools/hotplug/Linux/xendomains.in 
> > b/tools/hotplug/Linux/xendomains.in
> > index de711b7..2e65ac6 100644
> > --- a/tools/hotplug/Linux/xendomains.in
> > +++ b/tools/hotplug/Linux/xendomains.in
> > @@ -51,11 +51,7 @@ fi
> >  
> >  LOCKFILE=${XEN_LOCK_DIR}/xendomains
> >  
> > -if [ -d /etc/sysconfig ]; then
> > -   XENDOM_CONFIG=/etc/sysconfig/xendomains
> > -else
> > -   XENDOM_CONFIG=/etc/default/xendomains
> > -fi
> > +XENDOM_CONFIG=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xendomains
> >  
> >  test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
> >     if [ "$1" = "stop" ]; then exit 0;
> > 
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@xxxxxxxxxxxxx
> > http://lists.xen.org/xen-devel
> > 



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