From 59f416ae2082b026497d3b46cc805e3906553cec Mon Sep 17 00:00:00 2001
From: Amrith Kumar <amrith@amrith.org>
Date: Fri, 7 Jul 2017 22:26:48 -0400
Subject: [PATCH] The correct option for label name in fat and vfat is '-n'
The code in mkfs correctly extends the command line with a '-n' for
vfat but does not currently do it for fat. This means that mkfs for
fat ends up with a '-L' which is what you'd do for everything like
ext[234].
The change just treats fat like vfat in the one place where this check
is required.
Change-Id: If65dfd949acdadff33a564640fb42ea73026a786
Closes-Bug: #1703063
---
diskimage_builder/block_device/level2/mkfs.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diskimage_builder/block_device/level2/mkfs.py b/diskimage_builder/block_device/level2/mkfs.py
index 4091d31f8..41f458d4d 100644
--- a/diskimage_builder/block_device/level2/mkfs.py
+++ b/diskimage_builder/block_device/level2/mkfs.py
@@ -110,7 +110,7 @@ class FilesystemNode(NodeBase):
if self.opts:
cmd.extend(self.opts)
- if self.type == "vfat":
+ if self.type in ('vfat', 'fat'):
cmd.extend(["-n", self.label])
else:
cmd.extend(["-L", self.label])