Merge lp:~tom-gall/linaro-image-tools/linaro-media-create into lp:linaro-image-tools/11.11

[Tom Gall]

Small fix to linaro-media-create so that it respects FAT_SIZE which will now set the partition type correctly (0x0C or 0x0E)

Also removed use of fdisk in favor of sfdisk for MMC.

Fixes lp:622979

[Alexander Sack (asac)]

please resubmit with fix for:

ensure_command sfdisk fdisk util-linux

... this should be done in two lines; one line for each command.

review: Needs Resubmitting

Unmerged revisions

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-08-23 22:52:21 +0000
+++ linaro-media-create	2010-08-26 21:35:51 +0000
@@ -18,7 +18,7 @@
 
 ensure_command uuidgen uuidgen-runtime
 ensure_command parted parted
-ensure_command fdisk util-linux # threre is a fdisk binary provided by gnu-fdisk as well
+ensure_command sfdisk fdisk util-linux 
 ensure_command wget wget
 ensure_command mkfs.ext3 e2fsprogs
 ensure_command mkfs.ext4 e2fsprogs
@@ -129,12 +129,20 @@
 else
 partdev=${MMC}
 fi
-# Create a VFAT partition of 9 cylinders which is about 64M
+
+# Create a VFAT or FAT16 partition of 9 cylinders which is about 64M
 # and a linux partition of the rest
+if [ "$FAT_SIZE" = "32" ]; then 
 sudo sfdisk -D -H $HEADS -S $SECTORS $CYLINDER_ARG $partdev << 'THEEND'
 ,9,0x0C,*
 ,,,-
 THEEND
+else
+sudo sfdisk -D -H $HEADS -S $SECTORS $CYLINDER_ARG $partdev << 'THEEND'
+,9,0x0E,*
+,,,-
+THEEND
+fi
 
 if [ "${IMAGE_FILE}" ]; then
 VFATOFFSET=$(($(fdisk -l -u $IMAGE_FILE | grep FAT | awk '{print $3}')*512))
@@ -279,14 +287,14 @@
 
 function check_mmc {
  DISK_NAME="Disk|Platte"
- FDISK=$(sudo fdisk -l | grep "[${DISK_NAME}] ${MMC}" | awk '{print $2}')
+ FDISK=$(sudo sfdisk -l | grep "[${DISK_NAME}] ${MMC}" | awk '{print $2}')
 
  if test "-$FDISK-" = "-$MMC:-"
  then
   echo ""
   echo "I see..."
-  echo "sudo fdisk -l:"
-  sudo fdisk -l | grep "[${DISK_NAME}] /dev/" --color=never
+  echo "sudo sfdisk -l:"
+  sudo sfdisk -l | grep "[${DISK_NAME}] /dev/" --color=never
   echo ""
   echo "mount:"
   mount | grep -v none | grep "/dev/" --color=never
@@ -298,8 +306,8 @@
   echo ""
   echo "Are you sure? I Don't see [${MMC}], here is what I do see..."
   echo ""
-  echo "sudo fdisk -l:"
-  sudo fdisk -l | grep "[${DISK_NAME}] /dev/" --color=never
+  echo "sudo sfdisk -l:"
+  sudo sfdisk -l | grep "[${DISK_NAME}] /dev/" --color=never
   echo ""
   echo "mount:"
   mount | grep -v none | grep "/dev/" --color=never