curtin

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

  1. trunk.1539720
  2. Merge into trunk
Proposed by Scott Moser
Status: Merged
Merged at revision: 347
Proposed branch: lp:~smoser/curtin/trunk.1539720
Merge into: lp:~curtin-dev/curtin/trunk
Diff against target: 55 lines (+7/-5)
4 files modified
curtin/block/mkfs.py (+4/-4)
curtin/deps/__init__.py (+1/-0)
debian/control (+1/-0)
tests/unittests/test_block_mkfs.py (+1/-1)
To merge this branch: bzr merge lp:~smoser/curtin/trunk.1539720
Reviewer Review Type Date Requested Status
Ryan Harper (community) Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+284494@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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)
Revision history for this message
Ryan Harper (raharper) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'curtin/block/mkfs.py'
2--- curtin/block/mkfs.py 2016-01-19 19:32:21 +0000
3+++ curtin/block/mkfs.py 2016-01-29 18:36:35 +0000
4@@ -30,10 +30,10 @@
5 "ext2": "mkfs.ext2",
6 "ext3": "mkfs.ext3",
7 "ext4": "mkfs.ext4",
8- "fat": "mkfs.fat",
9- "fat12": "mkfs.fat",
10- "fat16": "mkfs.fat",
11- "fat32": "mkfs.fat",
12+ "fat": "mkfs.vfat",
13+ "fat12": "mkfs.vfat",
14+ "fat16": "mkfs.vfat",
15+ "fat32": "mkfs.vfat",
16 "jfs": "jfs_mkfs",
17 "ntfs": "mkntfs",
18 "reiserfs": "mkfs.reiserfs",
19
20=== modified file 'curtin/deps/__init__.py'
21--- curtin/deps/__init__.py 2016-01-06 17:52:19 +0000
22+++ curtin/deps/__init__.py 2016-01-29 18:36:35 +0000
23@@ -30,6 +30,7 @@
24 ('file', 'file'),
25 ('lvcreate', 'lvm2'),
26 ('mdadm', 'mdadm'),
27+ ('mkfs.vfat', 'dosfstools'),
28 ('mkfs.btrfs', 'btrfs-tools'),
29 ('mkfs.ext4', 'e2fsprogs'),
30 ('mkfs.xfs', 'xfsprogs'),
31
32=== modified file 'debian/control'
33--- debian/control 2015-11-20 20:42:00 +0000
34+++ debian/control 2016-01-29 18:36:35 +0000
35@@ -26,6 +26,7 @@
36 Architecture: all
37 Priority: extra
38 Depends: btrfs-tools,
39+ dosfstools,
40 file,
41 gdisk,
42 lvm2,
43
44=== modified file 'tests/unittests/test_block_mkfs.py'
45--- tests/unittests/test_block_mkfs.py 2016-01-19 19:34:01 +0000
46+++ tests/unittests/test_block_mkfs.py 2016-01-29 18:36:35 +0000
47@@ -79,7 +79,7 @@
48 def test_mkfs_fat(self):
49 conf = self._get_config("fat32")
50 expected_flags = [["-n", "format1"], ["-F", "32"]]
51- self._run_mkfs_with_config(conf, "mkfs.fat", expected_flags)
52+ self._run_mkfs_with_config(conf, "mkfs.vfat", expected_flags)
53
54 def test_mkfs_invalid_fstype(self):
55 """Do not proceed if fstype is None or invalid"""

Subscribers

People subscribed via source and target branches