]> glassweightruler.freedombox.rocks Git - Ventoy.git/commitdiff
Fix the bug when booting latest KaOS. (#1696)
authorlongpanda <admin@ventoy.net>
Mon, 27 Jun 2022 14:19:11 +0000 (22:19 +0800)
committerlongpanda <admin@ventoy.net>
Mon, 27 Jun 2022 14:19:11 +0000 (22:19 +0800)
IMG/cpio/ventoy/hook/kaos/ventoy-disk.sh
IMG/cpio/ventoy/hook/ventoy-hook-lib.sh

index c21c04c9d51fec27548d9f8972595ab641dd39ba..42569cc0e9d68f31e36c4c568a8285038c8ad130 100644 (file)
@@ -49,9 +49,10 @@ ventoy_os_install_dmsetup_by_fuse() {
         insmod $KoName
     fi
     
         insmod $KoName
     fi
     
-    umount $VTOY_PATH/mnt/squashfs
-    umount $VTOY_PATH/mnt/iso
-    umount $VTOY_PATH/mnt/fuse
+    ventoy_check_umount $VTOY_PATH/mnt/squashfs
+    ventoy_check_umount $VTOY_PATH/mnt/iso
+    ventoy_check_umount $VTOY_PATH/mnt/fuse
+    vtlog "umount done"
 }
 
 
 }
 
 
index db33eec220f4c44746a1888e799e56fa65a80020..7f24c428b2df4baef5ed43b461b8279de891f051 100644 (file)
@@ -868,3 +868,14 @@ ventoy_check_install_module_xz() {
         $BUSYBOX_PATH/insmod "$1"
     fi
 }
         $BUSYBOX_PATH/insmod "$1"
     fi
 }
+
+ventoy_check_umount() {
+    for vtLoop in 0 1 2 3 4 5 6 7 8 9; do
+        $BUSYBOX_PATH/umount "$1" > /dev/null 2>&1
+        if $BUSYBOX_PATH/mountpoint -q "$1"; then
+            $SLEEP 1
+        else
+            break
+        fi
+    done
+}