Merge lp:~paelzer/curtin/minor-mdadm-fs-fixes into lp:~curtin-dev/curtin/trunk

[Christian Ehrhardt ]

Minor fixes that came up when testing various mdadm options and filesystems.

[Scott Moser (smoser)]

i'm gonna pull this.

[Scott Moser (smoser)]

actually, this was part of reno 283 pull.

=== modified file 'curtin/commands/block_meta.py'
--- curtin/commands/block_meta.py	2015-10-02 18:30:42 +0000
+++ curtin/commands/block_meta.py	2015-10-13 19:17:09 +0000
@@ -36,7 +36,7 @@
 SIMPLE_BOOT = 'simple-boot'
 CUSTOM = 'custom'
 
-CUSTOM_REQUIRED_PACKAGES = ['mdadm', 'lvm2', 'bcache-tools']
+CUSTOM_REQUIRED_PACKAGES = ['mdadm', 'lvm2', 'bcache-tools', 'xfsprogs', 'btrfs-tools']
 
 CMD_ARGUMENTS = (
     ((('-D', '--devices'),
@@ -812,8 +812,12 @@
     spare_devices = info.get('spare_devices')
     if not devices:
         raise ValueError("devices for raid must be specified")
-    if raidlevel not in [0, 1, 5]:
+    if raidlevel not in ['linear', 'raid0', 0, 'stripe', 'raid1', 1, 'mirror',
+                         'raid4', 4, 'raid5', 5, 'raid6', 6, 'raid10', 10]:
         raise ValueError("invalid raidlevel '%s'" % raidlevel)
+    if raidlevel in ['linear', 'raid0', 0, 'stripe']:
+        if spare_devices:
+            raise ValueError("spares unsupported in raidlevel '%s'" % raidlevel)
 
     device_paths = list(get_path_to_storage_volume(dev, storage_config) for
                         dev in devices)