Merge lp:~liuyq0307/lava-master-image-scripts/use-kpartx into lp:lava-master-image-scripts

[Yongqin Liu]

change to use kpartx instead of partx to map the partitions of image file to kernel

[Spring Zhang (qzhang)]

+1

review: Approve

=== modified file 'lava-create-master'
--- lava-create-master	2012-05-16 13:05:26 +0000
+++ lava-create-master	2012-06-20 02:02:19 +0000
@@ -48,6 +48,9 @@
                 precise)
                     export LAVA_SUPPORTED=1
                     ;;
+                natty)
+                    export LAVA_SUPPORTED=1
+                    ;;
             esac
             ;;
     esac
@@ -253,7 +256,7 @@
     if [ -n "$LOOP_DEV" ]; then
         # Remove loopback partitions
         verbose " * Removing loopback device partitions..."
-        partx --delete $LOOP_DEV
+        kpartx -d $LOOP_DEV
         # Detach loopback device 
         verbose " * Detaching loopback device..."
         losetup --detach $LOOP_DEV
@@ -276,6 +279,13 @@
 
 
 make_master() {
+    if [ -z "$(which kpartx)" ]; then
+        sudo apt-get -y install kpartx
+        if [ $? -ne 0 ]; then
+            echo "Failed to install kpartx" >&2
+            exit 1
+        fi
+    fi
     # Cleanup on exit 
     trap cleanup EXIT
 
@@ -371,15 +381,16 @@
 
     # Add partition devices
     verbose " * Adding partitions to the loopback device..."
-    partx --add $LOOP_DEV
-
+    kpartx -av $LOOP_DEV
+    
     # Get a mount point for master image
     verbose " * Creating temporary mount point for rootfs..."
     MASTER_MNT=$(mktemp --directory --suffix .lava.$dev.master)
 
     # Mount the root filesystem
     verbose " * Mounting rootfs..."
-    mount ${LOOP_DEV}p${ROOTFS_PARTITION} $MASTER_MNT
+    LOOP_NAME=`basename ${LOOP_DEV}`
+    mount /dev/mapper/${LOOP_NAME}p${ROOTFS_PARTITION} $MASTER_MNT
     
     # Update hostname to 'master'
     verbose " * Changing hostname to 'master'..."