Index: trunk/packages/sipb-xen-autoinstaller/common/usr/sbin/sipb-xen-create-image
===================================================================
--- trunk/packages/sipb-xen-autoinstaller/common/usr/sbin/sipb-xen-create-image	(revision 1079)
+++ trunk/packages/sipb-xen-autoinstaller/common/usr/sbin/sipb-xen-create-image	(revision 1083)
@@ -11,5 +11,5 @@
 echo ,"${FSSIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
 
-kpartx -a "$TARGET"    # should be no-op in guest
+dmsetup info "$TARGET" && kpartx -a "$TARGET"
 
 xen-create-image --image-dev "${TARGET}1" --swap-dev "${TARGET}2" --fs ext3 --ide \
@@ -17,5 +17,5 @@
  --arch "$ARCH" --dist "$DIST" --mirror "$MIRROR" --cache=yes
 
-kpartx -d "$TARGET"
+dmsetup info "$TARGET" && kpartx -d "$TARGET"
 
 exit 0
Index: trunk/packages/sipb-xen-autoinstaller/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-autoinstaller/debian/changelog	(revision 1079)
+++ trunk/packages/sipb-xen-autoinstaller/debian/changelog	(revision 1083)
@@ -1,2 +1,8 @@
+sipb-xen-autoinstaller (2.7) unstable; urgency=low
+
+  * Skip kpartx call when running on physical devices
+
+ -- Evan Broder <broder@mit.edu>  Tue, 07 Oct 2008 00:25:18 -0400
+
 sipb-xen-autoinstaller (2.6) unstable; urgency=low