Changeset 259 for soft/giet_vm/create_dmg

Timestamp:

Dec 5, 2013, 12:45:34 PM (11 years ago)

Author:

devigne

Message:

giet_fat32/fat32.c :
Added _fat_write function. At the moment it does not support the creation of a
new file (the writing must exist in the disk image) and does not support the
allocation of additional cluster from the original file.

create_dmg :
Bug fix for support Linux (The tree files were not consistent with the
pathnames in boot.c).

giet_libs/stdlib.c and stdlib.h :
Added stdlib file. At the moment they only contain the atoi function.

giet_libs/stdio.h :
Bug fix in SYSCALL DEFINE. SYSCALL_FAT_READ, WRITE, CLOSE, LSEEK had the same
value.

Makefile :
Added compilation line for stdlib.o

File:

• soft/giet_vm/create_dmg (modified) (4 diffs)

soft/giet_vm/create_dmg

@@ -8 +8 @@
 reserved_sectors=32
 
+# FAT32 SPEC: The first two clusters are not present in the data region but
+# they are used in the computation of the FAT sectors
+data_region_clusters=$clusters-2
 
-let "data_sectors = (clusters - 2) * sectors_per_cluster"
-let "fat_sectors = (clusters * 4) / 512"
-let "sectors=data_sectors + fat_sectors + reserved_sectors" 
+let "data_sectors = data_region_clusters * sectors_per_cluster"
+let "fat_sectors  = (clusters * 4) / 512"
+
+# The disk image contains:
+#   - MBR sector : this sector is removed by this script as it will be copied
+#                  after)
+#   - Reserved region sectors (usually 32)
+#   - FAT region sectors
+#   - DATA region sectors
+let "sectors      = data_sectors + fat_sectors + reserved_sectors + 1" 
 
 platform=`uname`
@@ -43 +53 @@
                         # RAW DISK IMAGE READ-ONLY
                         # The not used space is not considered (smaller disk image)
-                        # format="UDRO"
+                        format="UDRO"
 
                         # RAW DISK IMAGE READ-WRITE
                         # None compression is made
-                        format="UDRW" 
+                        # format="UDRW" 
 
                         echo "Creating partition file $3 from $2 directory"
@@ -59 +69 @@
                                 -format $format \
                                 $3; 
-#                               -verbose \
+#                               -verbose \
 
                         echo "Removing first sector of diskimage"
@@ -106 +116 @@
 
 elif [[ $platform == "Linux" ]]; then
-        echo "Creating partion file: partition.dmg"
-        mkfs.vfat -C -F32 -S $sector_size -s $sectors_per_cluster \
-                partition.dmg $sectors 
+        case $1 in
+                create )
+                        if [[ -z $2 ]]; then
+                                echo "Create action need second argument: <srcdir_path>"
+                                exit 1;
+                        fi;
 
-        echo "Copying files into the partition"
-        mcopy -s -i partition.dmg build :://
-        mcopy -i    partition.dmg map.bin :://
+                        if [[ -z $3 ]]; then
+                                echo "Create action need third argument: <disk_image>"
+                                exit 1;
+                        fi;
 
-        echo "Copying MBR on the first sector"
-        dd if=mbr.dmg of=disk.dmg count=1 bs=$sector_size
+                        echo "Creating partition file: $3"
 
-        echo "Copying partition file on the sector 200 of the disk"
-        dd if=partition.dmg of=disk.dmg seek=200 bs=$sector_size
+                        let "sectors = (sectors - 1) / 2" 
+                    mkfs.vfat \
+                                -C \
+                                -F32 \
+                                -f 1 \
+                                -R $reserved_sectors \
+                                -S $sector_size \
+                                -s $sectors_per_cluster \
+                                -v \
+                                $3.dmg $sectors
+
+                        if [[ -e $2 ]]; then
+                                echo "Copying files from $2 into partition"
+                                mcopy -s -i $3.dmg $2/* :://
+                        fi;;
+
+                * )
+                        echo "Pass the command as the first parameter: "
+                        echo "  - create: create disk image"
+                        echo "            First parameter after create action is the path"
+                    echo "            of the directory to copy in the created "
+                        echo "            partition"
+                        echo ""
+                        echo "EXAMPLES:"
+                        echo " ./create_diskimage.sh create /path/to/source_dir disk_image"
+        esac;
 
 else