Index: /trunk/packages/sipb-xen-dom0/debian/changelog
===================================================================
--- /trunk/packages/sipb-xen-dom0/debian/changelog	(revision 1129)
+++ /trunk/packages/sipb-xen-dom0/debian/changelog	(revision 1130)
@@ -1,2 +1,10 @@
+sipb-xen-dom0 (2.9) unstable; urgency=low
+
+  * Move the qemu-ifup script to the location where it's now expected to
+    be.
+  * Clear out some debugging code from qemu-dm-sipb
+
+ -- Evan Broder <broder@mit.edu>  Sun, 19 Oct 2008 01:39:43 -0400
+
 sipb-xen-dom0 (2.8) unstable; urgency=low
 
Index: /trunk/packages/sipb-xen-dom0/files/etc/xen/qemu-ifup
===================================================================
--- /trunk/packages/sipb-xen-dom0/files/etc/xen/qemu-ifup	(revision 1130)
+++ /trunk/packages/sipb-xen-dom0/files/etc/xen/qemu-ifup	(revision 1130)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+echo "config qemu network with xen bridge for $@"
+
+if [ -z "$domid" ]; then
+    echo "domid is not set!!!" >&2
+    exit 1
+fi
+
+dev=$1
+qemu_online=yes
+XENBUS_PATH=/local/domain/0/backend/vif/${domid}/0
+vif=vif${domid}.0
+export vif qemu_online XENBUS_PATH dev 
+
+exec /etc/xen/scripts/vif-sipbroute online
Index: unk/packages/sipb-xen-dom0/files/etc/xen/scripts/qemu-ifup
===================================================================
--- /trunk/packages/sipb-xen-dom0/files/etc/xen/scripts/qemu-ifup	(revision 1129)
+++ 	(revision )
@@ -1,16 +1,0 @@
-#!/bin/sh
-
-echo "config qemu network with xen bridge for $@"
-
-if [ -z "$domid" ]; then
-    echo "domid is not set!!!" >&2
-    exit 1
-fi
-
-dev=$1
-qemu_online=yes
-XENBUS_PATH=/local/domain/0/backend/vif/${domid}/0
-vif=vif${domid}.0
-export vif qemu_online XENBUS_PATH dev 
-
-exec /etc/xen/scripts/vif-sipbroute online
Index: /trunk/packages/sipb-xen-dom0/files/usr/sbin/qemu-dm-sipb
===================================================================
--- /trunk/packages/sipb-xen-dom0/files/usr/sbin/qemu-dm-sipb	(revision 1129)
+++ /trunk/packages/sipb-xen-dom0/files/usr/sbin/qemu-dm-sipb	(revision 1130)
@@ -9,8 +9,3 @@
     fi
 done
-export domid
-echo 'BEGIN qemu-dm-sipb LOG' >> /tmp/log
-echo "$0 $@" >> /tmp/log
-env >> /tmp/log
-echo 'END qemu-dm-sipb LOG' >> /tmp/log
-exec "/usr/lib/xen/bin/qemu-dm.debug" "$@"
+exec "/usr/lib/xen/bin/qemu-dm" "$@"