openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Fix mkfs use wrong label option for vfat"

This commit is contained in:
Jenkins 2017-06-26 02:41:30 +00:00 committed by Gerrit Code Review
parent b0e0dd991c 178db0c97b
commit c1facd7980
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage_builder/block_device/level2/mkfs.py
View File

@ -109,7 +109,11 @@ class FilesystemNode(NodeBase):
cmd.extend(['-t', self.type])
if self.opts:
cmd.extend(self.opts)
cmd.extend(["-L", self.label])
if self.type == "vfat":
cmd.extend(["-n", self.label])
else:
cmd.extend(["-L", self.label])
if self.type in ('ext2', 'ext3', 'ext4'):
cmd.extend(['-U', self.uuid])