Skip kpartx call when running autoinstaller on physical devices

svn path=/trunk/packages/sipb-xen-autoinstaller/; revision=1083

diff --git a/common/usr/sbin/sipb-xen-create-image b/common/usr/sbin/sipb-xen-create-image
index 8b56ce9..531e6a1 100644 (file)
--- a/common/usr/sbin/sipb-xen-create-image
+++ b/common/usr/sbin/sipb-xen-create-image
@@ -10,12 +10,12 @@ set -e
 
 echo ,"${FSSIZE}"$',L,*\n,,S\n;\n;' | sfdisk -uM -H 255 -S 63 "$TARGET"
 
 
 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 \
  --hostname "$HOSTNAME" --ip="$IP" --netmask=255.255.0.0 --gateway=18.181.0.1 \
  --arch "$ARCH" --dist "$DIST" --mirror "$MIRROR" --cache=yes
 
 
 xen-create-image --image-dev "${TARGET}1" --swap-dev "${TARGET}2" --fs ext3 --ide \
  --hostname "$HOSTNAME" --ip="$IP" --netmask=255.255.0.0 --gateway=18.181.0.1 \
  --arch "$ARCH" --dist "$DIST" --mirror "$MIRROR" --cache=yes
 

-kpartx -d "$TARGET"
+dmsetup info "$TARGET" && kpartx -d "$TARGET"

 
 exit 0
 
 exit 0

diff --git a/debian/changelog b/debian/changelog
index 41dabf5..e5a5349 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
 
   * Update dependencies for Hardy
 sipb-xen-autoinstaller (2.6) unstable; urgency=low
 
   * Update dependencies for Hardy