[Xen-changelog] [xen-unstable] xend: Enable to set config variables in /etc/sysconfig/xend

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1252310421 -3600
# Node ID a2ab11e31f9123b11f83465ffd7622fa49806e4d
# Parent  55ef198e63c749354a514b569c91acdb0bea94e4
xend: Enable to set config variables in /etc/sysconfig/xend

The attached patch enables to set the environment variables for xend
in /etc/sysconfig/xend.

There are four variables.

XENCONSOLED_TRACE=3D[none|guest|hv|all]
XENSTORED_ROOTDIR=3D/var/lib/xenstored
XENSTORED_TRACE=3D[yes|on|1]
XENBACKENDD_DEBUG=3D[yes|on|1]

The XENCONSOLED_TRACE and XENSTORED_ROOTDIR take strings for each
command's options. And if thease variables have non-zero strings, then
export them.
If the XENSTORED_TRACE and XENBACKENDD_DEBUG take either "yes", "on"
or "1" then export them.

From: Kazuhiro SUZUKI <kaz@xxxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/hotplug/Linux/Makefile              |    2 ++
 tools/hotplug/Linux/init.d/sysconfig.xend |   11 +++++++++++
 tools/hotplug/Linux/init.d/xend           |    7 +++++++
 3 files changed, 20 insertions(+)

diff -r 55ef198e63c7 -r a2ab11e31f91 tools/hotplug/Linux/Makefile
--- a/tools/hotplug/Linux/Makefile      Mon Sep 07 08:48:12 2009 +0100
+++ b/tools/hotplug/Linux/Makefile      Mon Sep 07 09:00:21 2009 +0100
@@ -3,6 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 # Init scripts.
 XEND_INITD = init.d/xend
+XEND_SYSCONFIG = init.d/sysconfig.xend
 XENDOMAINS_INITD = init.d/xendomains
 XENDOMAINS_SYSCONFIG = init.d/sysconfig.xendomains
 
@@ -62,6 +63,7 @@ install-initd:
        [ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) 
$(DESTDIR)$(CONFIG_DIR)/init.d
        [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) 
$(DESTDIR)$(CONFIG_DIR)/sysconfig
        $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
+       $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xend
        $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
        $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) 
$(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains
 
diff -r 55ef198e63c7 -r a2ab11e31f91 tools/hotplug/Linux/init.d/sysconfig.xend
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/hotplug/Linux/init.d/sysconfig.xend Mon Sep 07 09:00:21 2009 +0100
@@ -0,0 +1,11 @@
+# Log xenconsoled messages (cf xm dmesg)
+#XENCONSOLED_TRACE=[none|guest|hv|all]
+
+# Log xenstored messages
+#XENSTORED_TRACE=[yes|on|1]
+
+# Running xenstored on XENSTORED_ROOTDIR
+#XENSTORED_ROOTDIR=/var/lib/xenstored
+
+# Running xenbackendd in debug mode
+#XENBACKENDD_DEBUG=[yes|on|1]
diff -r 55ef198e63c7 -r a2ab11e31f91 tools/hotplug/Linux/init.d/xend
--- a/tools/hotplug/Linux/init.d/xend   Mon Sep 07 08:48:12 2009 +0100
+++ b/tools/hotplug/Linux/init.d/xend   Mon Sep 07 09:00:21 2009 +0100
@@ -18,6 +18,9 @@
 # Short-Description: Start/stop xend
 # Description:       Starts and stops the Xen control daemon.
 ### END INIT INFO
+
+shopt -s extglob
+test -f /etc/sysconfig/xend && . /etc/sysconfig/xend
 
 if ! grep -q "control_d" /proc/xen/capabilities ; then
        exit 0
@@ -41,6 +44,10 @@ case "$1" in
   start)
        mkdir -p /var/lock/subsys
        touch /var/lock/subsys/xend
+       test -z "$XENSTORED_ROOTDIR" || export XENSTORED_ROOTDIR
+       test -z "$XENCONSOLED_TRACE" || export XENCONSOLED_TRACE
+       [[ "$XENSTORED_TRACE" == @(yes|on|1) ]] && export XENSTORED_TRACE
+       [[ "$XENBACKENDD_DEBUG" == @(yes|on|1) ]] && export XENBACKENDD_DEBUG
        xend start
        await_daemons_up
        ;;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog