fix: only export data partition after filesystem setup

Makefile

@@ -13,11 +13,22 @@ DOCKER_RUN_BASE := docker run -e UID=$(UID) -e GID=$(GID) -v $(PWD):/home/build/
 GO_BUILD_CMD := cd /home/build/NanoKVM/server && go mod tidy && CGO_ENABLED=1 GOOS=linux GOARCH=riscv64 CC=riscv64-unknown-linux-musl-gcc CGO_CFLAGS="-mcpu=c906fdv -march=rv64imafdcv0p7xthead -mcmodel=medany -mabi=lp64d" go build
 SUPPORT_BUILD_CMD := . ./home/build/MaixCDK/bin/activate && cd /home/build/NanoKVM/support/sg2002 && ./build kvm_system && ./build kvm_system add_to_kvmapp
 
-.PHONY: help check-root builder-image rebuild-image check-image shell app support all clean
+.PHONY: help check-root builder-image rebuild-image check-image shell app support all test test-s01fs-data-disk test-go-storage test-go-vm clean
 
 # Default target
 all: app support
 
+test: test-s01fs-data-disk test-go-storage test-go-vm
+
+test-s01fs-data-disk:
+	@bash tools/test-s01fs-data-disk.sh
+
+test-go-storage:
+	@cd server && go test ./service/storage
+
+test-go-vm:
+	@cd server && go test ./service/vm/virtualdisk
+
 # Help target
 help:
 	@echo "NanoKVM Build System"
@@ -31,6 +42,7 @@ help:
 	@echo "  app           - Build Go application server"
 	@echo "  support       - Build hardware support libraries"
 	@echo "  all           - Build both app and support (default)"
+	@echo "  test          - Run repository tests"
 	@echo "  clean         - Clean build artifacts"
 	@echo ""
 	@echo "Prerequisites:"
@@ -94,4 +106,4 @@ clean:
 		rm -rf support/sg2002/build; \
 		echo "Removed support/sg2002/build"; \
 	fi
-	@echo "Clean completed."
+	@echo "Clean completed."

kvmapp/system/init.d/S01fs

@@ -1,41 +1,142 @@
 #!/bin/sh
 
+: "${NANOKVM_DISK:=/dev/mmcblk0}"
+: "${NANOKVM_BOOT_PART:=/dev/mmcblk0p1}"
+: "${NANOKVM_ROOT_PART:=/dev/mmcblk0p2}"
+: "${NANOKVM_DATA_PART:=/dev/mmcblk0p3}"
+: "${NANOKVM_BOOT_DIR:=/boot}"
+: "${NANOKVM_DATA_DIR:=/data}"
+: "${NANOKVM_DISK0_MARKER:=/etc/kvm.disk0}"
+: "${NANOKVM_DATA_FORMAT_PENDING:=/etc/kvm.disk0.formatting}"
+: "${NANOKVM_PROFILE:=/etc/profile}"
+
+is_empty_partition() (
+        tmp="$(mktemp "${TMPDIR:-/tmp}/s01fs-data-head.XXXXXX")" || return 1
+        trap 'rm -f "$tmp"' EXIT
+
+        # Conservative recovery for devices stranded by older boots that marked
+        # disk0 complete before formatting finished.
+        if ! dd if="$1" of="$tmp" bs=1M count=4 2>/dev/null
+        then
+                return 1
+        fi
+
+        if [ "$(wc -c < "$tmp")" = "0" ]
+        then
+                return 0
+        fi
+
+        if ! od -An -tx1 "$tmp" | grep -q '[1-9a-fA-F]'
+        then
+                return 0
+        fi
+
+        return 1
+)
+
+format_and_mount_data_partition() {
+        if mkfs.exfat "$NANOKVM_DATA_PART"
+        then
+                rm -f "$NANOKVM_DATA_FORMAT_PENDING"
+                mkdir -p "$NANOKVM_DATA_DIR"
+                if mount "$NANOKVM_DATA_PART" "$NANOKVM_DATA_DIR"
+                then
+                        touch "$NANOKVM_DISK0_MARKER"
+                else
+                        rm -f "$NANOKVM_DISK0_MARKER"
+                fi
+        else
+                rm -f "$NANOKVM_DISK0_MARKER"
+        fi
+}
+
+normalize_disk_file() {
+        printf '%s' "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
+}
+
 if [ "$1" = "start" ]
 then
+        data_mount_handled=0
+        data_marker_after_mount=0
+
                 # use all sdcard free space for data
-                parted -s /dev/mmcblk0 "resizepart 2 -0"
+                parted -s "$NANOKVM_DISK" "resizepart 2 -0"
                 echo "yes
                 8192MB
-                " | parted ---pretend-input-tty /dev/mmcblk0 "resizepart 2 8192MB"
+                " | parted ---pretend-input-tty "$NANOKVM_DISK" "resizepart 2 8192MB"
                 # resize data filesystem
-                (resize2fs /dev/mmcblk0p2) &
+                (resize2fs "$NANOKVM_ROOT_PART") &
 
 
-        . /etc/profile
+        if [ -r "$NANOKVM_PROFILE" ]
+        then
+                # shellcheck disable=SC1090
+                . "$NANOKVM_PROFILE"
+        fi
         printf "mounting filesystem : "
-        mkdir -p /boot
-        mount -t vfat /dev/mmcblk0p1 /boot
+        mkdir -p "$NANOKVM_BOOT_DIR"
+        mount -t vfat "$NANOKVM_BOOT_PART" "$NANOKVM_BOOT_DIR"
         mount -t configfs configfs /sys/kernel/config
         mount -t debugfs debugfs /sys/kernel/debug
 
-        if [ -e /boot/usb.disk0 ]
+        disk0_file=""
+        if [ -e "$NANOKVM_BOOT_DIR/usb.disk0" ]
+        then
+                disk0_file="$(normalize_disk_file "$(cat "$NANOKVM_BOOT_DIR/usb.disk0")")"
+        fi
+
+        if [ -e "$NANOKVM_BOOT_DIR/usb.disk0" ] && { [ -z "$disk0_file" ] || [ "$disk0_file" = "$NANOKVM_DATA_PART" ]; }
         then
-                if [ ! -e /etc/kvm.disk0 ]
+                if [ ! -e "$NANOKVM_DATA_PART" ]
                 then
-                        touch /etc/kvm.disk0
                         # use all sdcard free space for data
-                        parted -s /dev/mmcblk0 "mkpart primary 8193MB 100%"
-                        sleep 1
-                        # resize data filesystem
-                        (mkfs.exfat /dev/mmcblk0p3) &
+                        if parted -s "$NANOKVM_DISK" "mkpart primary 8193MB 100%"
+                        then
+                                touch "$NANOKVM_DATA_FORMAT_PENDING"
+                        fi
                         sleep 1
                 fi
+
+        fi
+
+        if [ -e "$NANOKVM_DATA_PART" ] && [ -e "$NANOKVM_DATA_FORMAT_PENDING" ] && [ "$data_mount_handled" = "0" ]
+        then
+                format_and_mount_data_partition
+                data_mount_handled=1
         fi
 
-        if [ -e /dev/mmcblk0p3 ]
+        if [ -e "$NANOKVM_DATA_PART" ] && [ "$data_mount_handled" = "0" ]
         then
-                mkdir -p /data
-                mount /dev/mmcblk0p3 /data
+                if [ -n "$(blkid "$NANOKVM_DATA_PART" 2>/dev/null)" ]
+                then
+                        data_marker_after_mount=1
+                elif [ -e "$NANOKVM_DISK0_MARKER" ] && is_empty_partition "$NANOKVM_DATA_PART"
+                then
+                        touch "$NANOKVM_DATA_FORMAT_PENDING"
+                        format_and_mount_data_partition
+                        data_mount_handled=1
+                else
+                        # Existing unrecognized partitions may contain data. Only
+                        # format partitions this script created, marked pending, or
+                        # legacy-marked as complete while still empty.
+                        rm -f "$NANOKVM_DISK0_MARKER"
+                        data_mount_handled=1
+                fi
+        fi
+
+        if [ -e "$NANOKVM_DATA_PART" ] && [ "$data_mount_handled" = "0" ]
+        then
+                mkdir -p "$NANOKVM_DATA_DIR"
+                if mount "$NANOKVM_DATA_PART" "$NANOKVM_DATA_DIR"
+                then
+                        if [ "$data_marker_after_mount" = "1" ]
+                        then
+                                touch "$NANOKVM_DISK0_MARKER"
+                        fi
+                elif [ "$data_marker_after_mount" = "1" ]
+                then
+                        rm -f "$NANOKVM_DISK0_MARKER"
+                fi
         fi
 
         echo "OK"

kvmapp/system/init.d/S03usbdev

@@ -1,6 +1,62 @@
 #!/bin/sh
+# shellcheck disable=SC1091,SC2012,SC2164,SC3037
 # kvmhwd Rev2.2
 
+: "${NANOKVM_DISK0_MARKER:=/etc/kvm.disk0}"
+: "${NANOKVM_DATA_FORMAT_PENDING:=/etc/kvm.disk0.formatting}"
+: "${NANOKVM_DATA_PART:=/dev/mmcblk0p3}"
+: "${NANOKVM_BOOT_DIR:=/boot}"
+
+data_disk_ready(){
+    [ -e "$NANOKVM_DISK0_MARKER" ] && [ ! -e "$NANOKVM_DATA_FORMAT_PENDING" ] && [ -e "$NANOKVM_DATA_PART" ]
+}
+
+default_data_disk_file(){
+    if data_disk_ready
+    then
+            printf '%s\n' "$NANOKVM_DATA_PART"
+    fi
+}
+
+normalize_disk_file(){
+    printf '%s' "$1" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'
+}
+
+resolve_disk_file(){
+    disk_file="$(normalize_disk_file "$1")"
+    if [ -z "$disk_file" ] || [ "$disk_file" = "$NANOKVM_DATA_PART" ]
+    then
+            default_data_disk_file
+    else
+            printf '%s\n' "$disk_file"
+    fi
+}
+
+configure_mass_storage(){
+    if [ ! -e "$NANOKVM_BOOT_DIR/usb.disk0" ]
+    then
+            return
+    fi
+
+    disk=$(cat "$NANOKVM_BOOT_DIR/usb.disk0")
+    data_file="$(resolve_disk_file "$disk")"
+    if [ -z "$data_file" ]
+    then
+            return
+    fi
+
+    mkdir functions/mass_storage.disk0
+    ln -s functions/mass_storage.disk0 configs/c.1/
+    echo 1 > functions/mass_storage.disk0/lun.0/removable
+    if [ -e "$NANOKVM_BOOT_DIR/usb.disk0.ro" ]
+    then
+            echo 1 > functions/mass_storage.disk0/lun.0/ro
+            echo 0 > functions/mass_storage.disk0/lun.0/cdrom
+    fi
+    echo "NanoKVM USB Mass Storage0520" > functions/mass_storage.disk0/lun.0/inquiry_string
+    printf '%s\n' "$data_file" > functions/mass_storage.disk0/lun.0/file
+}
+
 start_usb_dev(){
     . /etc/profile
     echo "usb mode: device"
@@ -114,30 +170,7 @@ start_usb_dev(){
         ln -s functions/hid.GS2 configs/c.1
     fi
 
-    if [ -e /boot/usb.disk0 ]
-    then
-            mkdir functions/mass_storage.disk0
-            ln -s functions/mass_storage.disk0 configs/c.1/
-            echo 1 > functions/mass_storage.disk0/lun.0/removable
-            if [ -e /boot/usb.disk0.ro ]
-            then
-                    echo 1 > functions/mass_storage.disk0/lun.0/ro
-                    echo 0 > functions/mass_storage.disk0/lun.0/cdrom
-            fi
-            echo "NanoKVM USB Mass Storage0520" > functions/mass_storage.disk0/lun.0/inquiry_string
-            disk=$(cat /boot/usb.disk0)
-            if [ -z "${disk}" ]
-            then
-                    # if [ ! -e /mnt/usbdisk.img ]
-                    # then
-                    #         fallocate -l 8G /mnt/usbdisk.img
-                    #         mkfs.vfat /mnt/usbdisk.img
-                    # fi
-                    echo /dev/mmcblk0p3 > functions/mass_storage.disk0/lun.0/file
-            else
-                    cat /boot/usb.disk0 > functions/mass_storage.disk0/lun.0/file
-            fi
-    fi
+    configure_mass_storage
 
     ls /sys/class/udc/ | cat > UDC
     echo device > /proc/cviusb/otg_role

server/service/storage/image.go

@@ -18,13 +18,47 @@ import (
 
 const (
 	imageDirectory = "/data"
-	imageNone      = "/dev/mmcblk0p3"
-	cdromFlag      = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/cdrom"
-	mountDevice    = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/file"
-	inquiryString  = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/inquiry_string"
-	roFlag         = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/ro"
+	dataDiskMarker = "/etc/kvm.disk0"
+	formatPending  = "/etc/kvm.disk0.formatting"
+	dataPartition  = "/dev/mmcblk0p3"
 )
 
+var (
+	imageNone     = dataPartition
+	cdromFlag     = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/cdrom"
+	mountDevice   = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/file"
+	inquiryString = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/inquiry_string"
+	roFlag        = "/sys/kernel/config/usb_gadget/g0/functions/mass_storage.disk0/lun.0/ro"
+
+	dataDiskMarkerPath = dataDiskMarker
+	formatPendingPath  = formatPending
+	dataPartitionPath  = dataPartition
+)
+
+func defaultDataDiskImage() string {
+	if _, err := os.Stat(dataDiskMarkerPath); err != nil {
+		return ""
+	}
+	if _, err := os.Stat(formatPendingPath); err == nil {
+		return ""
+	}
+	if _, err := os.Stat(dataPartitionPath); err != nil {
+		return ""
+	}
+	return dataPartitionPath
+}
+
+func mountImagePath(requested string) (string, bool) {
+	requested = strings.TrimSpace(requested)
+	if requested == "" {
+		return "", true
+	}
+	if requested == dataPartitionPath {
+		return requested, defaultDataDiskImage() != ""
+	}
+	return requested, true
+}
+
 func (s *Service) GetImages(c *gin.Context) {
 	var rsp proto.Response
 	var images []string
@@ -63,6 +97,13 @@ func (s *Service) MountImage(c *gin.Context) {
 		return
 	}
 
+	// mount
+	image, ok := mountImagePath(req.File)
+	if !ok {
+		rsp.ErrRsp(c, -2, "data disk is not ready")
+		return
+	}
+
 	// cdrom and ro flag
 	// set to 0 when unmount image
 	// set to 1 when mount image and the CD-ROM is enabled
@@ -108,12 +149,6 @@ func (s *Service) MountImage(c *gin.Context) {
 		return
 	}
 
-	// mount
-	image := req.File
-	if image == "" {
-		image = imageNone
-	}
-
 	if err := os.WriteFile(mountDevice, []byte(image), 0o666); err != nil {
 		log.Errorf("mount file %s failed: %s", image, err)
 		rsp.ErrRsp(c, -2, "mount image failed")