Index: trunk/packages/sipb-xen-console-server/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-console-server/debian/changelog	(revision 395)
+++ trunk/packages/sipb-xen-console-server/debian/changelog	(revision 397)
@@ -1,2 +1,11 @@
+sipb-xen-console-server (2) unstable; urgency=low
+
+  * Use a python based update-conserver script that gets the list of
+    consoles from xm list
+  * Run the update-conserver script every 5 minutes to catch VMs that
+    are not started or stopped through the remctl interface
+
+ -- Evan Broder <broder@sipb-xen-dev.mit.edu>  Wed,  2 Apr 2008 04:32:58 -0400
+
 sipb-xen-console-server (1.0.2) unstable; urgency=low
 
Index: trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.cron.d
===================================================================
--- trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.cron.d	(revision 397)
+++ trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.cron.d	(revision 397)
@@ -0,0 +1,8 @@
+#
+# cron-jobs for sipb-xen-console-server
+# Refresh the list of active VM consoles
+#
+
+MAILTO=root
+
+*/5 * * * * root python /usr/sbin/sipb-xen-update-conserver
Index: trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen
===================================================================
--- trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen	(revision 395)
+++ trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen	(revision 397)
@@ -24,5 +24,5 @@
 }
 
-#include /etc/conserver/includes.cf
+#include /etc/conserver/sipb-xen-consoles.cf
 
 ##
Index: trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver
===================================================================
--- trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver	(revision 395)
+++ trunk/packages/sipb-xen-console-server/files/usr/sbin/sipb-xen-update-conserver	(revision 397)
@@ -1,4 +1,24 @@
-#!/bin/bash
+#!/usr/bin/python
 
-ls /etc/conserver/conf.d/ | sed -e 's|^|#include /etc/conserver/conf.d/|' >/etc/conserver/includes.cf
-/etc/init.d/conserver-server reload
+import sipb_xen_database
+import subprocess
+import os
+
+sipb_xen_database.connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+
+def live_vms():
+    p = subprocess.Popen(['xm', 'list'], stdout=subprocess.PIPE)
+    p.wait()
+    output = p.stdout.read()
+    vms = [x.split()[0][2:] for x in output.splitlines() if x.startswith('d_')]
+    return vms
+
+def reload_conserver():
+    p = subprocess.Popen(['/etc/init.d/conserver-server', 'restart'], stdout=subprocess.PIPE)
+    p.wait()
+
+if __name__ == '__main__':
+    f = open('/etc/conserver/sipb-xen-consoles.cf', 'w')
+    f.write('\n'.join('console %s {}' % vm for vm in live_vms()))
+    f.close()
+    reload_conserver()
Index: trunk/packages/sipb-xen-remctl-auto/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/debian/changelog	(revision 395)
+++ trunk/packages/sipb-xen-remctl-auto/debian/changelog	(revision 397)
@@ -1,2 +1,8 @@
+sipb-xen-remctl-auto (1.0.9) unstable; urgency=low
+
+  * Change the way that conserver is updated
+
+ -- Evan Broder <broder@sipb-xen-dev.mit.edu>  Wed,  2 Apr 2008 04:36:04 -0400
+
 sipb-xen-remctl-auto (1.0.8) unstable; urgency=low
 
Index: trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol	(revision 395)
+++ trunk/packages/sipb-xen-remctl-auto/files/usr/sbin/sipb-xen-vmcontrol	(revision 397)
@@ -20,5 +20,4 @@
     destroy|shutdown)
 	xm "$ACTION" "$MACHINE"
-	rm "/etc/conserver/conf.d/$MACHINE"
 	/usr/sbin/sipb-xen-update-conserver
 	;;
@@ -40,5 +39,4 @@
 	    xm create sipb-database machine_name="$ORIGMACHINE"
 	fi
-	echo "console $ORIGMACHINE {}" >"/etc/conserver/conf.d/$MACHINE"
 	/usr/sbin/sipb-xen-update-conserver
 	;;