Merge lp:~salgado/linaro-image-tools/prepare-partitions into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Port prepare_partitions to python.

[Guilherme Salgado (salgado)]

I may not be around when this is reviewed either, so if my dear reviewer is happy with it, please go ahead and land it. Otherwise I'll do so when I'm back.

[James Westby (james-w)]

review: Approve

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-12-16 20:27:05 +0000
+++ linaro-media-create	2010-12-17 13:31:53 +0000
@@ -424,42 +424,14 @@
 setup_partitions() {
   boot_and_root_devices=$(python -m media_create.partitions \
       "$DEVIMAGE" "${DEVICE-$IMAGE_FILE}" "$FAT_SIZE" "$IMAGE_SIZE" \
-      "$SHOULD_CREATE_PARTITIONS")
+      "$BOOT_LABEL" "$RFS_LABEL" "$RFS" "$RFS_UUID" \
+      "$SHOULD_CREATE_PARTITIONS" "$BOOTFS_STEP" "$ROOTFS_STEP")
   eval $boot_and_root_devices
 
   if [ "${IMAGE_FILE}" ]; then
     register_loopback "$BOOTFS"
     register_loopback "$ROOTFS"
   fi
-
-  prepare_partitions
-}
-
-prepare_partitions() {
-
-  if [ "$BOOTFS_STEP" ]; then
-    echo ""
-    echo "Formating Boot Partition"
-    echo ""
-    if [ -z "$BOOTFS" ]; then
-      echo "Partition $BOOTFS does not exist"
-      exit 2
-    else
-      sudo mkfs.vfat -F ${FAT_SIZE} ${BOOTFS} -n ${BOOT_LABEL}
-    fi
-  fi
-
-  if [ "$ROOTFS_STEP" ]; then
-    echo ""
-    echo "Formating ${RFS} Partition"
-    echo ""
-    if [ -z "$ROOTFS" ]; then
-      echo "Partition $ROOTFS does not exist"
-      exit 2
-    else
-      sudo mkfs.${RFS} -U "$RFS_UUID" ${ROOTFS} -L ${RFS_LABEL}
-    fi
-  fi
 }
 
 populate_boot() {

=== modified file 'media_create/partitions.py'
--- media_create/partitions.py	2010-12-14 14:14:06 +0000
+++ media_create/partitions.py	2010-12-17 13:31:53 +0000
@@ -22,7 +22,9 @@
 # small enough that there's not much benefit in doing that, but if it grows we
 # might want to do it.
 def setup_partitions(board, media, fat_size, image_size,
-                     should_create_partitions):
+                     bootfs_label, rootfs_label, rootfs_type, rootfs_uuid,
+                     should_create_partitions, should_format_bootfs,
+                     should_format_rootfs):
     """Make sure the given device is partitioned to boot the given board.
 
     :param board: The board's name, as a string.
@@ -48,9 +50,26 @@
         create_partitions(board, media, fat_size, HEADS, SECTORS, cylinders)
 
     if media.is_block_device:
-        return get_boot_and_root_partitions_for_media(media)
+        bootfs, rootfs = get_boot_and_root_partitions_for_media(media)
     else:
-        return get_boot_and_root_loopback_devices(media.path)
+        bootfs, rootfs = get_boot_and_root_loopback_devices(media.path)
+
+    if should_format_bootfs:
+        print "\nFormating boot partition\n"
+        proc = cmd_runner.run(
+            ['mkfs.vfat', '-F', str(fat_size), bootfs, '-n', bootfs_label],
+            as_root=True)
+        proc.wait()
+
+    if should_format_rootfs:
+        print "\nFormating root partition\n"
+        mkfs = 'mkfs.%s' % rootfs_type
+        proc = cmd_runner.run(
+            [mkfs, '-U', rootfs_uuid, rootfs, '-L', rootfs_label],
+            as_root=True)
+        proc.wait()
+
+    return bootfs, rootfs
 
 
 def get_boot_and_root_loopback_devices(image_file):
@@ -71,7 +90,7 @@
         stdout=subprocess.PIPE, as_root=True)
     root_device, _ = proc.communicate()
 
-    return boot_device, root_device
+    return boot_device.strip(), root_device.strip()
 
 
 def calculate_partition_size_and_offset(image_file):
@@ -248,9 +267,18 @@
 
 
 if __name__ == "__main__":
-    board, device, fat_size, image_size, should_create_partitions = (
-        sys.argv[1:])
+    (board, device, fat_size, image_size, bootfs_label, rootfs_label,
+        rootfs_type, rootfs_uuid, should_create_partitions, bootfs_step,
+        rootfs_step) = sys.argv[1:]
     fat_size = int(fat_size)
+    should_format_bootfs = True
+    should_format_rootfs = True
+    if bootfs_step == "":
+        should_format_bootfs = False
+    if rootfs_step == "":
+        should_format_rootfs = False
     boot, root = setup_partitions(
-        board, Media(device), fat_size, image_size, should_create_partitions)
+        board, Media(device), fat_size, image_size, bootfs_label,
+        rootfs_label, rootfs_type, rootfs_uuid, should_create_partitions,
+        should_format_bootfs, should_format_rootfs)
     print "BOOTFS=%s ROOTFS=%s" % (boot, root)

=== modified file 'media_create/tests/test_media_create.py'
--- media_create/tests/test_media_create.py	2010-12-14 14:14:06 +0000
+++ media_create/tests/test_media_create.py	2010-12-17 13:31:53 +0000
@@ -428,7 +428,12 @@
         # already setup image file.
         tempfile = self._create_qemu_img_with_partitions(',1,0x0C,*\n,,,-')
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
-        setup_partitions('beagle', Media(tempfile), 32, '2G', 'yes')
+        self.useFixture(MockSomethingFixture(
+            sys, 'stdout', open('/dev/null', 'w')))
+        uuid = '2e82008e-1af3-4699-8521-3bf5bac1e67a'
+        bootfs, rootfs = setup_partitions(
+            'beagle', Media(tempfile), 32, '2G', 'boot', 'root', 'ext3',
+            uuid, 'yes', 'format-bootfs', 'format-rootfs')
         self.assertEqual(
              # This is the call that would create the image file.
             [['qemu-img', 'create', '-f', 'raw', tempfile, '2G'],
@@ -442,20 +447,29 @@
              ['sudo', 'losetup', '-f', '--show', tempfile, '--offset',
               '32256', '--sizelimit', '129024'],
              ['sudo', 'losetup', '-f', '--show', tempfile, '--offset',
-              '161280', '--sizelimit', '10321920']],
+              '161280', '--sizelimit', '10321920'],
+             ['sudo', 'mkfs.vfat', '-F', '32', bootfs, '-n', 'boot'],
+             ['sudo', 'mkfs.ext3', '-U', uuid, rootfs, '-L', 'root']],
             popen_fixture.mock.calls)
 
     def test_setup_partitions_for_block_device(self):
         self.useFixture(MockSomethingFixture(
+            sys, 'stdout', open('/dev/null', 'w')))
+        self.useFixture(MockSomethingFixture(
             partitions, '_get_partition_count', lambda media: 2))
         tempfile = self._create_qemu_img_with_partitions(',1,0x0C,*\n,,,-')
         media = Media(tempfile)
         # Pretend our tempfile is a block device.
         media.is_block_device = True
         popen_fixture = self.useFixture(MockCmdRunnerPopenFixture())
-        setup_partitions('beagle', media, 32, '2G', 'yes')
+        uuid = '2e82008e-1af3-4699-8521-3bf5bac1e67a'
+        bootfs, rootfs = setup_partitions(
+            'beagle', media, 32, '2G', 'boot', 'root', 'ext3',
+            uuid, 'yes', 'format-bootfs', 'format-rootfs')
         self.assertEqual(
             [['sudo', 'parted', '-s', tempfile, 'mklabel', 'msdos'],
              ['sudo', 'sfdisk', '-D', '-H', '255', '-S', '63', tempfile],
-             ['sync']],
+             ['sync'],
+             ['sudo', 'mkfs.vfat', '-F', '32', bootfs, '-n', 'boot'],
+             ['sudo', 'mkfs.ext3', '-U', uuid, rootfs, '-L', 'root']],
             popen_fixture.mock.calls)

=== modified file 'tests/integration.txt'
--- tests/integration.txt	2010-12-14 13:30:32 +0000
+++ tests/integration.txt	2010-12-17 13:31:53 +0000
@@ -11,14 +11,17 @@
 
     # Partition (for real!) /dev/sdb for a beagle board and return the devices
     # for the boot and root partitions.
-    >>> python -m media_create.partitions beagle /dev/sdb 32 2G yes
+    >>> python -m media_create.partitions beagle /dev/sdb 32 2G boot root ext3
+    ...     2e82008e-1af3-4699-8521-3bf5bac1e67a yes format-bootfs format-rootfs
     Checking that no-one is using this disk right now
     ...
     BOOTFS=/dev/sdb1 ROOTFS=/dev/sdb2
 
     # Partition /tmp/beagle.img for a beagle board and return the loopback
     # devices for the boot and root partitions.
-    >>> python -m media_create.partitions beagle /tmp/beagle.img 32 2G yes
+    >>> python -m media_create.partitions beagle /tmp/beagle.img 32 2G boot
+    ...     root ext3 2e82008e-1af3-4699-8521-3bf5bac1e67a yes
+    ...     format-bootfs format-rootfs
     Warning: /tmp/beagle.img is not a block device
     ...
     BOOTFS=/dev/loop0