Merge lp:~blake-rouse/curtin/fix-block-meta-fstype into lp:~curtin-dev/curtin/trunk

[Blake Rouse]

Use args.fstype in fstab generation.

=== modified file 'curtin/commands/block_meta.py'
--- curtin/commands/block_meta.py	2014-06-08 11:51:47 +0000
+++ curtin/commands/block_meta.py	2014-06-19 11:51:56 +0000
@@ -126,7 +126,7 @@
     util.subp(['mount', rootdev, state['target']])
 
     with open(state['fstab'], "w") as fp:
-        fp.write("LABEL=%s / %s defaults 0 0\n" % ('cloudimg-rootfs', 'ext4'))
+        fp.write("LABEL=%s / %s defaults 0 0\n" % ('cloudimg-rootfs', args.fstype))
 
     return 0