From 92ed4f6668efccf6af73f45654405d333e6a318c Mon Sep 17 00:00:00 2001 From: salmonik Date: Sat, 1 Aug 2026 02:19:07 +0200 Subject: fat: mount every FAT32 volume under /disk//, fix multi-entry LFN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fat.rs: VOL: Option → VOLS: Vec; try_mount() returns a Volume per disk and init() mounts every valid FAT32 volume found. Volume UID = sanitized uppercase label + 8-hex volume serial (e.g. RSDOS-5BD1E55F): unique per format, stable across reboots, human-recognizable, machine-parseable (^[A-Z0-9_]+-[0-9A-F]{8}$); cloned volumes get a -N suffix. Public ops take a vol index and select it (select_vol also picks the backing AHCI disk), matching the ahci::select pattern - fs.rs: /disk is now a plain directory whose children are one Disk node per mounted volume, named by UID; DiskInfo carries vol - LFN fix: entries are stored last-first on disk — both the writer (head-entry first) and reader (append in disk order) were reversed and cancelled out for ≤13-char names; multi-entry names (>13 chars) read back mangled (e.g. 'from-kernel.txt' as 'xt'). Writer now places seq=1 closest to the SFN and seq=N|0x40 first; reader places chunks by sequence number and trims at the first NUL. Verified with a 25-char filename round trip: kernel ls/cat correct, mtools shows the full LFN, fsck clean on both volumes - test-disk.sh: test file renamed to disk-test-.txt (>13 chars, exercises multi-entry LFN); UID discovered from the boot log; QEMU stdio redirected to a log file + EXIT trap so an orphaned QEMU can never hang a piped caller (it previously did, 400s) --- scripts/mkdisk.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/mkdisk.sh') diff --git a/scripts/mkdisk.sh b/scripts/mkdisk.sh index f9a8c09..6bdd50c 100755 --- a/scripts/mkdisk.sh +++ b/scripts/mkdisk.sh @@ -55,10 +55,10 @@ fi # mkfs.fat sizes are 1024-byte blocks; accept M/G/K suffixes too. case "$SIZE" in -*G) SIZE_BLOCKS=$(( ${SIZE%G} * 1024 * 1024 )) ;; -*M) SIZE_BLOCKS=$(( ${SIZE%M} * 1024 )) ;; -*K) SIZE_BLOCKS=$(( ${SIZE%K} )) ;; -*) SIZE_BLOCKS="$SIZE" ;; +*G) SIZE_BLOCKS=$((${SIZE%G} * 1024 * 1024)) ;; +*M) SIZE_BLOCKS=$((${SIZE%M} * 1024)) ;; +*K) SIZE_BLOCKS=$((${SIZE%K})) ;; +*) SIZE_BLOCKS="$SIZE" ;; esac if [ -z "$SIZE_BLOCKS" ] || [ "$SIZE_BLOCKS" -le 0 ] 2>/dev/null; then echo "mkdisk: bad size '$SIZE' (use e.g. 64M or 65536)" >&2 -- cgit v1.2.3