Index: trunk/packages/xvm-iscsi-config/debian/changelog
===================================================================
--- trunk/packages/xvm-iscsi-config/debian/changelog	(revision 1979)
+++ trunk/packages/xvm-iscsi-config/debian/changelog	(revision 1980)
@@ -2,6 +2,7 @@
 
   * Configure iSCSI for multipath on eth0 and eth1.
+  * Configure multipath.
 
- -- Evan Broder <broder@mit.edu>  Wed, 14 Jan 2009 19:45:56 -0500
+ -- Evan Broder <broder@mit.edu>  Wed, 14 Jan 2009 19:51:24 -0500
 
 xvm-iscsi-config (0.0.6) unstable; urgency=low
Index: trunk/packages/xvm-iscsi-config/debian/control
===================================================================
--- trunk/packages/xvm-iscsi-config/debian/control	(revision 1979)
+++ trunk/packages/xvm-iscsi-config/debian/control	(revision 1980)
@@ -8,5 +8,5 @@
 Package: xvm-iscsi-config
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base, open-iscsi
+Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base, open-iscsi, multipath-tools
 Description: iSCSI configuration for SIPB's XVM project
  This package should be installed on all XVM host machines to
Index: trunk/packages/xvm-iscsi-config/debian/rules
===================================================================
--- trunk/packages/xvm-iscsi-config/debian/rules	(revision 1979)
+++ trunk/packages/xvm-iscsi-config/debian/rules	(revision 1980)
@@ -4,5 +4,6 @@
 
 DEB_DIVERT_FILES_xvm-iscsi-config += \
-	/etc/iscsi/iscsid.conf.xvm
+	/etc/iscsi/iscsid.conf.xvm \
+	/etc/multipath.conf.xvm
 
 DEB_DH_INSTALLINIT_ARGS += --no-start
Index: trunk/packages/xvm-iscsi-config/debian/xvm-iscsi-config.install
===================================================================
--- trunk/packages/xvm-iscsi-config/debian/xvm-iscsi-config.install	(revision 1979)
+++ trunk/packages/xvm-iscsi-config/debian/xvm-iscsi-config.install	(revision 1980)
@@ -1,2 +1,3 @@
 debian/iscsid.conf.xvm.mako etc/iscsi
 ifaces etc/iscsi
+multipath.conf.xvm etc
Index: trunk/packages/xvm-iscsi-config/multipath.conf.xvm
===================================================================
--- trunk/packages/xvm-iscsi-config/multipath.conf.xvm	(revision 1980)
+++ trunk/packages/xvm-iscsi-config/multipath.conf.xvm	(revision 1980)
@@ -0,0 +1,3 @@
+defaults {
+    no_path_retry queue
+}