From 900f18653046d2fbbc888150d84bf0ec9f9c78b2 Mon Sep 17 00:00:00 2001
From: fslongjin <fslongjin@vip.qq.com>
Date: Thu, 7 Jul 2022 23:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A3=81=E7=9B=98=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run.sh                    |  1 +
 tools/create_hdd_image.sh | 12 +++++++++---
 tools/mount_virt_disk.sh  |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/run.sh b/run.sh
index 07a95aa4..97121e36 100644
--- a/run.sh
+++ b/run.sh
@@ -91,6 +91,7 @@ fi
 # 拷贝应用程序到硬盘
 cd tools
 bash m*
+sudo mkdir -p ${root_folder}/bin/disk_mount
 sudo cp ${root_folder}/bin/user/shell.elf ${root_folder}/bin/disk_mount
 sudo cp ${root_folder}/bin/user/about.elf ${root_folder}/bin/disk_mount
 sudo mkdir ${root_folder}/bin/disk_mount/dev
diff --git a/tools/create_hdd_image.sh b/tools/create_hdd_image.sh
index ef450be0..79ed5116 100755
--- a/tools/create_hdd_image.sh
+++ b/tools/create_hdd_image.sh
@@ -5,6 +5,12 @@ qemu-img create -f raw disk.img 16M
 # 按顺序输入，并且，每次输入完成后要按下回车）
 fdisk disk.img
 
-echo "Successfully created disk image, please make a FAT32 filesystem on it"
-sudo mkdir -p ../bin
-sudo cp ./disk.img ../bin/
+LOOP_DEVICE=$(sudo losetup -f --show -P disk.img) \
+    || exit 1
+echo ${LOOP_DEVICE}p1
+sudo mkfs.vfat -F 32 ${LOOP_DEVICE}p1
+sudo losetup -d ${LOOP_DEVICE}
+
+echo "Successfully created disk image."
+mkdir -p ../bin
+mv ./disk.img ../bin/
diff --git a/tools/mount_virt_disk.sh b/tools/mount_virt_disk.sh
index 8a7314ce..1eb06565 100755
--- a/tools/mount_virt_disk.sh
+++ b/tools/mount_virt_disk.sh
@@ -2,7 +2,7 @@ LOOP_DEVICE=$(sudo losetup -f --show -P ../bin/disk.img) \
     || exit 1
 
 echo ${LOOP_DEVICE}p1
-sudo mkfs.vfat -F 32 ${LOOP_DEVICE}p1
+
 mkdir -p ../bin/disk_mount/
 sudo mount ${LOOP_DEVICE}p1 ../bin/disk_mount/ 
 lsblk
\ No newline at end of file