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

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

[Olaf Hering]

... 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@aepfle.de>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
 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;

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

[Ian Campbell]

On Tue, 2014-10-14 at 08:55 +0200, Olaf Hering wrote:
> ... 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@aepfle.de>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Is this a bug fix or a feature? What are the risks? IsLKonrad OK with
it?

> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
>  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;

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

[Olaf Hering]

On Tue, Oct 14, Ian Campbell wrote:

> On Tue, 2014-10-14 at 08:55 +0200, Olaf Hering wrote:
> > ... 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@aepfle.de>
> 
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Is this a bug fix or a feature? What are the risks? IsLKonrad OK with

Now that these files are installed in --sysconfig=DIR its wrong to parse
some other files that may or may not exist on the system. So in that
sense its a bugfix.

Olaf

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

[Ian Jackson]

Olaf Hering writes ("[PATCH for-xen-4.5] tools/hotplug: use configure --sysconfdir result"):
> ... instead of hardcoding values and guess where they config files may
> be. Also use the result of --with-sysconfig-leaf-dir.

This looks plausible but I haven't tested it.  Olaf, have you done
before-and-after test builds and checked that the results in
dist/install/ are identical ?

Thanks,
Ian.

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

[Olaf Hering]

On Tue, Oct 14, Ian Jackson wrote:

> Olaf Hering writes ("[PATCH for-xen-4.5] tools/hotplug: use configure --sysconfdir result"):
> > ... instead of hardcoding values and guess where they config files may
> > be. Also use the result of --with-sysconfig-leaf-dir.
> 
> This looks plausible but I haven't tested it.  Olaf, have you done
> before-and-after test builds and checked that the results in
> dist/install/ are identical ?

I have verified that the values are what they are supposed to be. My
/opt/xen/staging-upstream/etc/init.d/xencommons has
xencommons_config=/opt/xen/staging-upstream/etc/sysconfig. Similar with
odd values for --sysconfdir and --with-sysconfig-leaf-dir.

Olaf

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

[Olaf Hering]

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@aepfle.de>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
>  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@lists.xen.org
> http://lists.xen.org/xen-devel
> 

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

[Ian Campbell]

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

In <1413279117.1497.25.camel@citrix.com> I said:
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 
> 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@aepfle.de>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > Cc: Wei Liu <wei.liu2@citrix.com>
> > ---
> >  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@lists.xen.org
> > http://lists.xen.org/xen-devel
> > 

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

[Konrad Rzeszutek Wilk]

On Wed, Nov 12, 2014 at 11:12:06AM +0000, Ian Campbell wrote:
> You forgot to add the release manager... I've done that for you.
> 
> In <1413279117.1497.25.camel@citrix.com> I said:
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> > 
> > Is this a bug fix or a feature? What are the risks? IsLKonrad OK with
> > it?

Back again to that question.

What happens if we do not take that in now but delay to Xen 4.6?

Will systemd still correctly work? It looks like it will and 
this is just an improvement that makes the code be more streamlined.

It does not fix a bug (at least that is what I see from
reading), I believe this should be deferred to Xen 4.6.


> 
> 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@aepfle.de>
> > > Cc: Ian Campbell <ian.campbell@citrix.com>
> > > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > > Cc: Wei Liu <wei.liu2@citrix.com>
> > > ---
> > >  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@lists.xen.org
> > > http://lists.xen.org/xen-devel
> > > 
> 
> 

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

[Olaf Hering]

On Wed, Nov 12, Konrad Rzeszutek Wilk wrote:

 
> What happens if we do not take that in now but delay to Xen 4.6?

I will be very unhappy...
I mean, what exactly is the concern here?!

> Will systemd still correctly work? It looks like it will and 
> this is just an improvement that makes the code be more streamlined.
> 
> It does not fix a bug (at least that is what I see from
> reading), I believe this should be deferred to Xen 4.6.

It does fix a bug. If the whole thing was configured with --prefix=X
--sysconfdir=Y parts of it will still refer to hardcoded paths entirely
unrelated to what was just installed with 'make install'.

Olaf

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

[Konrad Rzeszutek Wilk]

On Wed, Nov 12, 2014 at 06:06:57PM +0100, Olaf Hering wrote:
> On Wed, Nov 12, Konrad Rzeszutek Wilk wrote:
> 
>  
> > What happens if we do not take that in now but delay to Xen 4.6?
> 
> I will be very unhappy...
> I mean, what exactly is the concern here?!

I need to know what the risk is if this does not go in. We
are at RC2 and I really want to make the amount of patches
that go in be a trickle.
> 
> > Will systemd still correctly work? It looks like it will and 
> > this is just an improvement that makes the code be more streamlined.
> > 
> > It does not fix a bug (at least that is what I see from
> > reading), I believe this should be deferred to Xen 4.6.
> 
> It does fix a bug. If the whole thing was configured with --prefix=X
> --sysconfdir=Y parts of it will still refer to hardcoded paths entirely
> unrelated to what was just installed with 'make install'.

How often does that happen? Do the two paths that are specified
in the code cover 99% of the use-cases?

> 
> Olaf

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

[Olaf Hering]

On Wed, Nov 12, Konrad Rzeszutek Wilk wrote:

> On Wed, Nov 12, 2014 at 06:06:57PM +0100, Olaf Hering wrote:
> > On Wed, Nov 12, Konrad Rzeszutek Wilk wrote:
> > 
> >  
> > > What happens if we do not take that in now but delay to Xen 4.6?
> > 
> > I will be very unhappy...
> > I mean, what exactly is the concern here?!
> 
> I need to know what the risk is if this does not go in. We
> are at RC2 and I really want to make the amount of patches
> that go in be a trickle.

Its risk free.

> > > Will systemd still correctly work? It looks like it will and 
> > > this is just an improvement that makes the code be more streamlined.
> > > 
> > > It does not fix a bug (at least that is what I see from
> > > reading), I believe this should be deferred to Xen 4.6.
> > 
> > It does fix a bug. If the whole thing was configured with --prefix=X
> > --sysconfdir=Y parts of it will still refer to hardcoded paths entirely
> > unrelated to what was just installed with 'make install'.
> 
> How often does that happen? Do the two paths that are specified
> in the code cover 99% of the use-cases?

It covers 100% of the use cases. Just today someone complained on
xen-users that stuff isnt appearing below /usr/local (not sure why, not
our fault), but even if it was there it wouldnt be used because the code
hardcodes /etc.

Olaf

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

[Konrad Rzeszutek Wilk]

On Wed, Nov 12, 2014 at 06:23:46PM +0100, Olaf Hering wrote:
> On Wed, Nov 12, Konrad Rzeszutek Wilk wrote:
> 
> > On Wed, Nov 12, 2014 at 06:06:57PM +0100, Olaf Hering wrote:
> > > On Wed, Nov 12, Konrad Rzeszutek Wilk wrote:
> > > 
> > >  
> > > > What happens if we do not take that in now but delay to Xen 4.6?
> > > 
> > > I will be very unhappy...
> > > I mean, what exactly is the concern here?!
> > 
> > I need to know what the risk is if this does not go in. We
> > are at RC2 and I really want to make the amount of patches
> > that go in be a trickle.
> 
> Its risk free.
> 
> > > > Will systemd still correctly work? It looks like it will and 
> > > > this is just an improvement that makes the code be more streamlined.
> > > > 
> > > > It does not fix a bug (at least that is what I see from
> > > > reading), I believe this should be deferred to Xen 4.6.
> > > 
> > > It does fix a bug. If the whole thing was configured with --prefix=X
> > > --sysconfdir=Y parts of it will still refer to hardcoded paths entirely
> > > unrelated to what was just installed with 'make install'.
> > 
> > How often does that happen? Do the two paths that are specified
> > in the code cover 99% of the use-cases?
> 
> It covers 100% of the use cases. Just today someone complained on
> xen-users that stuff isnt appearing below /usr/local (not sure why, not
> our fault), but even if it was there it wouldnt be used because the code
> hardcodes /etc.

Excellent.

Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> 
> Olaf

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

[Ian Campbell]

On Wed, 2014-11-12 at 13:56 -0500, Konrad Rzeszutek Wilk wrote:

> Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Applied.