Merge lp:~martin-ohlson/linaro-image-tools/disk-info-bug-673410 into lp:linaro-image-tools/11.11

[Martin Ohlsson]

Replace "sfdisk -l" with "fdisk -l".

Bug #673410.

Use "fdisk -l" to list the partiton tables in a more user friendly manner.

I haven't been able to run the script for test/verification. I'm waiting on the IT department to install Ubuntu on my company computer. This branch is proposed for merging because it contains a very trivial fix.

Regards,
Martin

[Guilherme Salgado (salgado)]

Hi Martin,

This looks good and seems to work as expected. Thanks!

 review approve

review: Approve

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-11-09 20:48:16 +0000
+++ linaro-media-create	2010-11-18 08:49:53 +0000
@@ -145,14 +145,14 @@
 }
 
 check_device() {
-  FDISK=$(sudo LC_ALL=C sfdisk -l 2>/dev/null | grep "Disk ${DEVICE}" | awk '{print $2}')
+  FDISK=$(sudo LC_ALL=C fdisk -l 2>/dev/null | grep "Disk ${DEVICE}" | awk '{print $2}')
 
   if test "-$FDISK-" = "-$DEVICE:-"
   then
     echo ""
     echo "I see..."
-    echo "sudo sfdisk -l:"
-    sudo LC_ALL=C sfdisk -l 2>/dev/null | grep "Disk /dev/" --color=never
+    echo "sudo fdisk -l:"
+    sudo LC_ALL=C fdisk -l 2>/dev/null | grep "Disk /dev/" --color=never
     echo ""
     echo "mount:"
     LC_ALL=C mount | grep -v none | grep "/dev/" --color=never
@@ -164,8 +164,8 @@
     echo ""
     echo "Are you sure? I Don't see [${DEVICE}], here is what I do see..."
     echo ""
-    echo "sudo sfdisk -l:"
-    sudo LC_ALL=C sfdisk -l 2>/dev/null| grep "Disk /dev/" --color=never
+    echo "sudo fdisk -l:"
+    sudo LC_ALL=C fdisk -l 2>/dev/null| grep "Disk /dev/" --color=never
     echo ""
     echo "mount:"
     LC_ALL=C mount | grep -v none | grep "/dev/" --color=never