[Xen-changelog] [xen-unstable] tools/hotplug: read /etc/default/xencommons if appropriate

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

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1293040111 0
# Node ID f69037cc467417db626836d7a41c65c0f28c3c28
# Parent  2f4b4521ff73c79722df74ff203be0aae9624fdc
tools/hotplug: read /etc/default/xencommons if appropriate

Since 22187:c41252a55a0a we have been installing our example
xencommons settings file in either /etc/sysconfig or /etc/default,
depending on whether /etc/sysconfig exists.

However I omitted to add the code to /etc/init.d/xencommons to
actually read either version of the file, although every other init
script seems to have it.

An effect of this misplaced/unread file is that the automatic tests
don't cause xenconsoled to collect serial logs, because the tester
edits whichever file actually exists.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/hotplug/Linux/init.d/xencommons |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

diff -r 2f4b4521ff73 -r f69037cc4674 tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons     Tue Dec 21 18:10:46 2010 +0000
+++ b/tools/hotplug/Linux/init.d/xencommons     Wed Dec 22 17:48:31 2010 +0000
@@ -18,7 +18,13 @@
 # Description:       Starts and stops the daemons neeeded for xl/xend
 ### END INIT INFO
 
-test -f /etc/sysconfig/xencommons && . /etc/sysconfig/xencommons
+if [ -d /etc/sysconfig ]; then
+       xencommons_config=/etc/sysconfig
+else
+       xencommons_config=/etc/default
+fi
+
+test -f $xencommons_config/xencommons && . $xencommons_config/xencommons
 
 XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
 shopt -s extglob

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