Merge lp:~smoser/curtin/trunk.1539720 into lp:~curtin-dev/curtin/trunk

[Scott Moser]

change mkfs.fat to mkfs.vfat and add dependency.

older versions of dosfstools did not provide a 'mkfs.fat'.
So we just use mkfs.vfat that does.

change mkfs.fat to mkfs.vfat and add dependency.

older versions of dosfstools did not provide a 'mkfs.fat'.
So we just use mkfs.vfat that does.

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

FAILED: Continuous integration, rev:345
https://server-team-jenkins.canonical.com/job/curtin-ci/148/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/145/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

LGTM

review: Approve

=== modified file 'curtin/block/mkfs.py'
--- curtin/block/mkfs.py	2016-01-19 19:32:21 +0000
+++ curtin/block/mkfs.py	2016-01-29 18:36:35 +0000
@@ -30,10 +30,10 @@
     "ext2": "mkfs.ext2",
     "ext3": "mkfs.ext3",
     "ext4": "mkfs.ext4",
-    "fat": "mkfs.fat",
-    "fat12": "mkfs.fat",
-    "fat16": "mkfs.fat",
-    "fat32": "mkfs.fat",
+    "fat": "mkfs.vfat",
+    "fat12": "mkfs.vfat",
+    "fat16": "mkfs.vfat",
+    "fat32": "mkfs.vfat",
     "jfs": "jfs_mkfs",
     "ntfs": "mkntfs",
     "reiserfs": "mkfs.reiserfs",
 
=== modified file 'curtin/deps/__init__.py'
--- curtin/deps/__init__.py	2016-01-06 17:52:19 +0000
+++ curtin/deps/__init__.py	2016-01-29 18:36:35 +0000
@@ -30,6 +30,7 @@
     ('file', 'file'),
     ('lvcreate', 'lvm2'),
     ('mdadm', 'mdadm'),
+    ('mkfs.vfat', 'dosfstools'),
     ('mkfs.btrfs', 'btrfs-tools'),
     ('mkfs.ext4', 'e2fsprogs'),
     ('mkfs.xfs', 'xfsprogs'),
 
=== modified file 'debian/control'
--- debian/control	2015-11-20 20:42:00 +0000
+++ debian/control	2016-01-29 18:36:35 +0000
@@ -26,6 +26,7 @@
 Architecture: all
 Priority: extra
 Depends: btrfs-tools,
+         dosfstools,
          file,
          gdisk,
          lvm2,
 
=== modified file 'tests/unittests/test_block_mkfs.py'
--- tests/unittests/test_block_mkfs.py	2016-01-19 19:34:01 +0000
+++ tests/unittests/test_block_mkfs.py	2016-01-29 18:36:35 +0000
@@ -79,7 +79,7 @@
     def test_mkfs_fat(self):
         conf = self._get_config("fat32")
         expected_flags = [["-n", "format1"], ["-F", "32"]]
-        self._run_mkfs_with_config(conf, "mkfs.fat", expected_flags)
+        self._run_mkfs_with_config(conf, "mkfs.vfat", expected_flags)
 
     def test_mkfs_invalid_fstype(self):
         """Do not proceed if fstype is None or invalid"""