Index: /trunk/packages/invirt-cluster-config/debian/changelog
===================================================================
--- /trunk/packages/invirt-cluster-config/debian/changelog	(revision 1988)
+++ /trunk/packages/invirt-cluster-config/debian/changelog	(revision 1989)
@@ -1,2 +1,9 @@
+invirt-cluster-config (0.0.8) unstable; urgency=low
+
+  * Add Provides and Conflicts lines to debian/control for
+    config-package-dev
+
+ -- Evan Broder <broder@mit.edu>  Sat, 24 Jan 2009 20:14:39 -0500
+
 invirt-cluster-config (0.0.7) unstable; urgency=low
 
Index: /trunk/packages/invirt-cluster-config/debian/control
===================================================================
--- /trunk/packages/invirt-cluster-config/debian/control	(revision 1988)
+++ /trunk/packages/invirt-cluster-config/debian/control	(revision 1989)
@@ -10,4 +10,6 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base,
  cman, clvm
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Cluster configuration for the Invirt project
  This package should be installed on all Invirt host machines to
Index: /trunk/packages/invirt-database-server/debian/changelog
===================================================================
--- /trunk/packages/invirt-database-server/debian/changelog	(revision 1988)
+++ /trunk/packages/invirt-database-server/debian/changelog	(revision 1989)
@@ -1,2 +1,9 @@
+invirt-database-server (0.0.9) unstable; urgency=low
+
+  * Add Provides and Conflicts lines to debian/control for
+    config-package-dev
+
+ -- Evan Broder <broder@mit.edu>  Sat, 24 Jan 2009 20:15:08 -0500
+
 invirt-database-server (0.0.8) unstable; urgency=low
 
Index: /trunk/packages/invirt-database-server/debian/control
===================================================================
--- /trunk/packages/invirt-database-server/debian/control	(revision 1988)
+++ /trunk/packages/invirt-database-server/debian/control	(revision 1989)
@@ -11,4 +11,6 @@
  python-sqlalchemy, python-psycopg2, invirt-database, adduser,
  invirt-base
+Provides: ${diverted-files}
+Replaces: ${diverted-files}
 Description: Installs the Invirt database server
  This tracks all the user VMs and is accessed from the VM host
Index: /trunk/packages/invirt-remote/host/usr/sbin/invirt-lvm
===================================================================
--- /trunk/packages/invirt-remote/host/usr/sbin/invirt-lvm	(revision 1988)
+++ /trunk/packages/invirt-remote/host/usr/sbin/invirt-lvm	(revision 1989)
@@ -68,5 +68,5 @@
     # this is running non-interactively), so let's just drop them on
     # the floor for now.
-    if os.fork() == 0:
+    if os.fork() != 0:
         call(["/bin/dd", "if=/dev/zero", "of=%s" % new_lvpath])
         call(["/sbin/lvchange", "-a", "n", new_lvpath])
Index: /trunk/packages/invirt-web/debian/changelog
===================================================================
--- /trunk/packages/invirt-web/debian/changelog	(revision 1988)
+++ /trunk/packages/invirt-web/debian/changelog	(revision 1989)
@@ -1,2 +1,9 @@
+invirt-web (0.0.17) unstable; urgency=low
+
+  * Add Provides and Conflicts lines to debian/control for
+    config-package-dev
+
+ -- Evan Broder <broder@mit.edu>  Sat, 24 Jan 2009 20:15:29 -0500
+
 invirt-web (0.0.16) unstable; urgency=low
 
Index: /trunk/packages/invirt-web/debian/control
===================================================================
--- /trunk/packages/invirt-web/debian/control	(revision 1988)
+++ /trunk/packages/invirt-web/debian/control	(revision 1989)
@@ -14,3 +14,5 @@
  libapache2-mod-auth-kerb, mail-transport-agent, subversion, zephyr-clients,
  openafs-modules-xen, cron
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: the Invirt web interface
Index: /trunk/packages/invirt-xen-config/debian/changelog
===================================================================
--- /trunk/packages/invirt-xen-config/debian/changelog	(revision 1988)
+++ /trunk/packages/invirt-xen-config/debian/changelog	(revision 1989)
@@ -1,2 +1,9 @@
+invirt-xen-config (0.0.20) unstable; urgency=low
+
+  * Add Provides and Conflicts lines to debian/control for
+    config-package-dev
+
+ -- Evan Broder <broder@mit.edu>  Sat, 24 Jan 2009 20:16:06 -0500
+
 invirt-xen-config (0.0.19) unstable; urgency=low
 
Index: /trunk/packages/invirt-xen-config/debian/control
===================================================================
--- /trunk/packages/invirt-xen-config/debian/control	(revision 1988)
+++ /trunk/packages/invirt-xen-config/debian/control	(revision 1989)
@@ -11,4 +11,6 @@
  invirt-base, python-sqlalchemy, python-psycopg2,
  invirt-database
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Xen configuration for Invirt host
  This package configures Xen for an Invirt host.
Index: /trunk/packages/xvm-iscsi-config/debian/changelog
===================================================================
--- /trunk/packages/xvm-iscsi-config/debian/changelog	(revision 1988)
+++ /trunk/packages/xvm-iscsi-config/debian/changelog	(revision 1989)
@@ -1,2 +1,9 @@
+xvm-iscsi-config (0.0.9) unstable; urgency=low
+
+  * Add Provides and Conflicts lines to debian/control for
+    config-package-dev
+
+ -- Evan Broder <broder@mit.edu>  Sat, 24 Jan 2009 20:16:12 -0500
+
 xvm-iscsi-config (0.0.8) unstable; urgency=low
 
Index: /trunk/packages/xvm-iscsi-config/debian/control
===================================================================
--- /trunk/packages/xvm-iscsi-config/debian/control	(revision 1988)
+++ /trunk/packages/xvm-iscsi-config/debian/control	(revision 1989)
@@ -9,4 +9,6 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base, open-iscsi, multipath-tools
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: iSCSI configuration for SIPB's XVM project
  This package should be installed on all XVM host machines to
Index: /trunk/packages/xvm-mail-config/debian/changelog
===================================================================
--- /trunk/packages/xvm-mail-config/debian/changelog	(revision 1988)
+++ /trunk/packages/xvm-mail-config/debian/changelog	(revision 1989)
@@ -1,2 +1,9 @@
+xvm-mail-config (0.0.8) unstable; urgency=low
+
+  * Add Provides and Conflicts lines to debian/control for
+    config-package-dev
+
+ -- Evan Broder <broder@mit.edu>  Sat, 24 Jan 2009 20:16:32 -0500
+
 xvm-mail-config (0.0.7) unstable; urgency=low
 
Index: /trunk/packages/xvm-mail-config/debian/control
===================================================================
--- /trunk/packages/xvm-mail-config/debian/control	(revision 1988)
+++ /trunk/packages/xvm-mail-config/debian/control	(revision 1989)
@@ -10,4 +10,6 @@
 Pre-Depends: debconf
 Depends: ${shlibs:Depends}, ${misc:Depends}, postfix, procmail
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure mail forwarding on XVM Servers
  Configure an MTA for all servers. Accept mail on the 10.5.128/24
Index: /trunk/packages/xvm-munin-config/debian/changelog
===================================================================
--- /trunk/packages/xvm-munin-config/debian/changelog	(revision 1988)
+++ /trunk/packages/xvm-munin-config/debian/changelog	(revision 1989)
@@ -1,2 +1,9 @@
+xvm-munin-config (0.0.6) unstable; urgency=low
+
+  * Add Provides and Conflicts lines to debian/control for
+    config-package-dev
+
+ -- Evan Broder <broder@mit.edu>  Sat, 24 Jan 2009 20:17:06 -0500
+
 xvm-munin-config (0.0.5) unstable; urgency=low
 
Index: /trunk/packages/xvm-munin-config/debian/control
===================================================================
--- /trunk/packages/xvm-munin-config/debian/control	(revision 1988)
+++ /trunk/packages/xvm-munin-config/debian/control	(revision 1989)
@@ -9,4 +9,6 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, adduser, smartmontools
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure Munin monitoring on XVM hosts
  Configure the munin-node daemon on all XVM servers. Each server gets
@@ -18,4 +20,6 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, adduser, libdbd-pg-perl
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure Munin monitoring on XVM master server
  Configure the munin-node daemon on all XVM servers. Each server gets
@@ -28,4 +32,6 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, adduser
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure Munin monitoring on XVM remote servers
  Configure the munin-node daemon on all XVM servers. Each server gets
@@ -37,4 +43,6 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, munin-node, adduser
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Configure Munin monitoring on XVM console server
  Configure the munin-node daemon on all XVM servers. Each server gets