Skip to contentSkip to conversation

Revert "wic: Set a miniumum FAT16 volume size."

PATCH In review Angus Lees 1 participant 2 messages Mar 21, 2019 – Apr 20, 2019

lore
Share & tools
lore

Angus Lees

author
#0 lore raw

PATCH 1/1 Revert "wic: Set a miniumum FAT16 volume size."

This reverts commit f7dfb4d43247d3c13a4e0a3853007d63b9512b83.

FAT16 volumes do not have a minimum size of 8250 blocks (== slightly over 4MB). Exhibit A: floppy disks.

The original commit message suggests this was a workaround for a bug in parted - in which case we should fix it there, or use the wic --fixed-size option to pass down an enforced minimum from a more context-aware point in the callstack.
---
(This should also be backported to sumo)

 scripts/lib/wic/partition.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/partition.py +1 -1
index 3fe5c4e26c..2178321404 100644
@@ -322,7 +322,7 @@ class Partition():
 
         dosfs_cmd = "mkdosfs %s -i %s %s %s -C %s %d" % \
                     (label_str, self.fsuuid, size_str, extraopts, rootfs,
-                     max(8250, rootfs_size))
+                     rootfs_size)
         exec_native_cmd(dosfs_cmd, native_sysroot)
 
         mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)
Signature · 1 line
2.11.0
author
#1 lore raw

ping?

Quoted 32 lines · Angus Lees

This reverts commit f7dfb4d43247d3c13a4e0a3853007d63b9512b83.

FAT16 volumes do not have a minimum size of 8250 blocks (== slightly over 4MB). Exhibit A: floppy disks.

The original commit message suggests this was a workaround for a bug in parted - in which case we should fix it there, or use the wic --fixed-size option to pass down an enforced minimum from a more context-aware point in the callstack.
---
(This should also be backported to sumo)

 scripts/lib/wic/partition.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/partition.py +1 -2
index 3fe5c4e26c..2178321404 100644
@@ -322,7 +322,7 @@ class Partition():
 
         dosfs_cmd = "mkdosfs %s -i %s %s %s -C %s %d" % \
                     (label_str, self.fsuuid, size_str, extraopts, rootfs,
-                     max(8250, rootfs_size))
+                     rootfs_size)
         exec_native_cmd(dosfs_cmd, native_sysroot)
 
         mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)
--

2.11.0

Signature · 1 line
 - Gus