openstack
/
diskimage-builder
Code Issues Proposed changes

Fix mkfs use wrong label option for vfat 

For vfat type, mkfs should use '-n' option for label.
e.g.:
mkfs -t vfat -n LABEL-STRING

Change-Id: I1414c5b8e0aeb240c3e6884e35ba75dde677db0c
This commit is contained in:
Xinliang Liu 2017-06-22 14:44:40 +08:00
parent 18a0d970fa
commit 178db0c97b
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])