Changeset 14f2100 in mainline

Timestamp:

2010-07-28T15:24:16Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9a1d8ab

Parents:

7dfd339

Message:

create FAT with a guaranteed amount of free space

Files:

• boot/Makefile (modified) (1 diff)
• contrib/conf/ia32-qe.sh (modified) (1 diff)
• contrib/conf/mips32-gx.sh (modified) (1 diff)
• tools/mkfat.py (modified) (3 diffs)

boot/Makefile

@@ -48 +48 @@
 endif
 ifeq ($(RDFMT),fat)
-        $(MKFAT) $(DIST_PATH) $@
+        $(MKFAT) 1048576 $(DIST_PATH) $@
 endif
 

contrib/conf/ia32-qe.sh

@@ -5 +5 @@
 # Create a disk image if it does not exist
 if [ ! -f "$DISK_IMG" ]; then
-        tools/mkfat.py uspace/dist/data "$DISK_IMG"
+        tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG"
 fi
 

contrib/conf/mips32-gx.sh

@@ -5 +5 @@
 # Create a disk image if it does not exist
 if [ ! -f "$DISK_IMG" ]; then
-        tools/mkfat.py uspace/dist/data "$DISK_IMG"
+        tools/mkfat.py 1048576 uspace/dist/data "$DISK_IMG"
 fi
 

tools/mkfat.py

@@ -343 +343 @@
 def usage(prname):
         "Print usage syntax"
-        print prname + " <PATH> <IMAGE>"
+        print prname + " <EXTRA_BYTES> <PATH> <IMAGE>"
 
 def main():
-        if (len(sys.argv) < 3):
+        if (len(sys.argv) < 4):
                 usage(sys.argv[0])
                 return
         
-        path = os.path.abspath(sys.argv[1])
+        if (not sys.argv[1].isdigit()):
+                print "<EXTRA_BYTES> must be a number"
+                return
+        
+        extra_bytes = int(sys.argv[1])
+        
+        path = os.path.abspath(sys.argv[2])
         if (not os.path.isdir(path)):
                 print "<PATH> must be a directory"
@@ -365 +371 @@
         
         # Make sure the filesystem is large enought for FAT16
-        size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size
+        size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + extra_bytes
         while (size / cluster_size < fat16_clusters):
                 if (cluster_size > sector_size):
                         cluster_size /= 2
-                        size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size
+                        size = subtree_size(path, cluster_size, dirent_size) + reserved_clusters * cluster_size + extra_bytes
                 else:
                         size = fat16_clusters * cluster_size + reserved_clusters * cluster_size
@@ -381 +387 @@
         data_start = root_start + root_size
         
-        outf = file(sys.argv[2], "w")
+        outf = file(sys.argv[3], "w")
         
         boot_sector = xstruct.create(BOOT_SECTOR)