Merge lp:~wesley-wiedenmeier/curtin/1597522 into lp:~curtin-dev/curtin/trunk

[Wesley Wiedenmeier]

Only append '-s 1' flag to mkfs commands when creating vfat volume on advanced format disk.
Also, support specifying sector size to mkfs.xfs and properly format argument.

Fixes (LP: 1597522)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:401
https://server-team-jenkins.canonical.com/job/curtin-ci/288/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/285/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/288/rebuild

review: Approve (continuous-integration)

[lp:~wesley-wiedenmeier/curtin/1597522]

402. By Wesley Wiedenmeier on 2016-06-29

Add partition 3 on main disk to disks_to_check in test_uefi_basic

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:402
https://server-team-jenkins.canonical.com/job/curtin-ci/289/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/286/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/289/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

review: Approve

=== modified file 'curtin/block/mkfs.py'
--- curtin/block/mkfs.py	2016-04-14 19:24:47 +0000
+++ curtin/block/mkfs.py	2016-06-29 23:19:31 +0000
@@ -91,6 +91,7 @@
         "btrfs": "--sectorsize",
         "ext": "-b",
         "fat": "-S",
+        "xfs": "-s",
         "ntfs": "--sector-size",
         "reiserfs": "--block-size"}
 }
@@ -165,12 +166,15 @@
     # use device logical block size to ensure properly formated filesystems
     (logical_bsize, physical_bsize) = block.get_blockdev_sector_size(path)
     if logical_bsize > 512:
+        lbs_str = ('size={}'.format(logical_bsize) if fs_family == "xfs"
+                   else str(logical_bsize))
         cmd.extend(get_flag_mapping("sectorsize", fs_family,
-                                    param=str(logical_bsize),
-                                    strict=strict))
-        # mkfs.vfat doesn't calculate this right for non-512b sector size
-        # lp:1569576 , d-i uses the same setting.
-        cmd.extend(["-s", "1"])
+                                    param=lbs_str, strict=strict))
+
+        if fs_family == 'fat':
+            # mkfs.vfat doesn't calculate this right for non-512b sector size
+            # lp:1569576 , d-i uses the same setting.
+            cmd.extend(["-s", "1"])
 
     if force:
         cmd.extend(get_flag_mapping("force", fs_family, strict=strict))

=== modified file 'examples/tests/uefi_basic.yaml'
--- examples/tests/uefi_basic.yaml	2016-04-07 21:03:58 +0000
+++ examples/tests/uefi_basic.yaml	2016-06-29 23:19:31 +0000
@@ -22,6 +22,12 @@
     size: 3G
     type: partition
     wipe: superblock
+  - id: id_disk0_part3
+    number: 3
+    size: 1G
+    type: partition
+    wipe: superblock
+    device: id_disk0
   - fstype: fat32
     id: id_efi_format
     label: efi
@@ -32,10 +38,19 @@
     label: root
     type: format
     volume: id_disk0_part2
+  - id: id_home_format
+    label: home
+    type: format
+    fstype: xfs
+    volume: id_disk0_part3
   - device: id_root_format
     id: id_root_mount
     path: /
     type: mount
+  - device: id_home_format
+    type: mount
+    path: /home
+    id: id_home_mount
   - device: id_efi_format
     id: id_efi_mount
     path: /boot/efi

=== modified file 'tests/vmtests/test_uefi_basic.py'
--- tests/vmtests/test_uefi_basic.py	2016-06-13 20:49:15 +0000
+++ tests/vmtests/test_uefi_basic.py	2016-06-29 23:19:31 +0000
@@ -12,7 +12,7 @@
     conf_file = "examples/tests/uefi_basic.yaml"
     extra_disks = []
     uefi = True
-    disk_to_check = [('main_disk', 1), ('main_disk', 2)]
+    disk_to_check = [('main_disk', 1), ('main_disk', 2), ('main_disk', 3)]
     collect_scripts = [textwrap.dedent("""
         cd OUTPUT_COLLECT_D
         blkid -o export /dev/vda > blkid_output_vda