[Xen-devel] [PATCH] for xend init script and xend python script

[ShaunR <mailinglists@xxxxxxxxxxxxxxxx>]

This patch does the following, hopefully it will be added to future 
versions.
* xend init script will now send SIGINT to xenconsoled when stop is 
issued so that the xenconsoled daemon is also stopped (this is required 
if the new options below are added to /etc/sysconfig/xend
* /etc/sysconfig/xend has additional these additional cosnole options 
since the xend init script starts xenconsoled.
        XENCONSOLED_LOG=(none|guest|hv|all)
        XENCONSOLED_LOGDIR=PATH
        XENCONSOLED_TIMESTAMP=(none|guest|hv|all)
        XENCONSOLED_OVERFLOW=(discard|keep)
        XENCONSOLED_PIDFILE=PATH

* xend python script now checks for the options above and passed them to 
xenconsoled


--- tools/misc/xend.orig        2010-10-22 12:25:46.000000000 -0700
+++ tools/misc/xend     2010-10-22 12:26:12.000000000 -0700
@@ -99,9 +99,24 @@

 def start_consoled():
     XENCONSOLED_TRACE = os.getenv("XENCONSOLED_TRACE")
+    XENCONSOLED_LOG = os.getenv("XENCONSOLED_LOG")
+    XENCONSOLED_LOGDIR = os.getenv("XENCONSOLED_LOGDIR")
+    XENCONSOLED_TIMESTAMP = os.getenv("XENCONSOLED_TIMESTAMP")
+    XENCONSOLED_OVERFLOW = os.getenv("XENCONSOLED_OVERFLOW")
+    XENCONSOLED_PIDFILE = os.getenv("XENCONSOLED_PIDFILE")
     args = ""
     if XENCONSOLED_TRACE:
-        args += "--log=" + XENCONSOLED_TRACE
+        args += "--log=" + XENCONSOLED_TRACE + " "
+    elif XENCONSOLED_LOG:
+        args += "--log=" + XENCONSOLED_LOG + " "
+    if XENCONSOLED_LOGDIR:
+        args += "--log-dir=" + XENCONSOLED_LOGDIR + " "
+    if XENCONSOLED_TIMESTAMP:
+        args += "--timestamp=" + XENCONSOLED_TIMESTAMP + " "
+    if XENCONSOLED_OVERFLOW:
+        args += "--overflow=" + XENCONSOLED_OVERFLOW + " "
+    if XENCONSOLED_PIDFILE:
+        args += "--pid-file=" + XENCONSOLED_PIDFILE + " "
     start_daemon("xenconsoled", args)

 def start_blktapctrl():


--- tools/hotplug/Linux/init.d/xend.orig        2010-10-22 
12:26:50.000000000 -0700
+++ tools/hotplug/Linux/init.d/xend     2010-10-22 12:28:42.000000000 -0700
@@ -55,6 +55,11 @@
        touch /var/lock/subsys/xend
        test -z "$XENSTORED_ROOTDIR" || export XENSTORED_ROOTDIR
        test -z "$XENCONSOLED_TRACE" || export XENCONSOLED_TRACE
+   test -z "$XENCONSOLED_LOG" || export XENCONSOLED_LOG
+   test -z "$XENCONSOLED_LOGDIR" || export XENCONSOLED_LOGDIR
+   test -z "$XENCONSOLED_TIMESTAMP" || export XENCONSOLED_TIMESTAMP
+   test -z "$XENCONSOLED_OVERFLOW" || export XENCONSOLED_OVERFLOW
+   test -z "$XENCONSOLED_PIDFILE" || export XENCONSOLED_PIDFILE
        [[ "$XENSTORED_TRACE" == @(yes|on|1) ]] && export XENSTORED_TRACE
        [[ "$XENBACKENDD_DEBUG" == @(yes|on|1) ]] && export 
XENBACKENDD_DEBUG
        xend start
@@ -62,6 +67,9 @@
        ;;
   stop)
        xend stop
+       if [ -n "`pidof xenconsoled`" ]; then
+               kill -2 `pidof xenconsoled`
+       fi
        rm -f /var/lock/subsys/xend
        ;;
   status)


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