From fb1144fbdae2f07eefbcb19702f2191b1aef8b19 Mon Sep 17 00:00:00 2001
From: fslongjin <longjin@RinGoTek.cn>
Date: Sun, 14 Aug 2022 17:35:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E8=A1=8C=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E5=8C=B9=E9=85=8D=E5=9B=9E?=
 =?UTF-8?q?=E7=8E=AF=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run.sh                    | 5 +----
 tools/umount_virt_disk.sh | 7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/run.sh b/run.sh
index c3b9a94b..ba0fa65f 100644
--- a/run.sh
+++ b/run.sh
@@ -106,10 +106,7 @@ cfg_content='set timeout=15
 
     # ${GRUB_PATH}/grub-mkrescue -o ${iso} ${iso_folder}
     # rm -rf ${iso_folder}
-    LOOP_DEVICE=$(lsblk | grep disk_mount)
-
-    LOOP_DEVICE=${LOOP_DEVICE:2:10}
-    LOOP_DEVICE=${LOOP_DEVICE%%p1*}
+    LOOP_DEVICE=$(lsblk | grep disk_mount|sed 's/.*\(loop[0-9]*\)p1.*/\1/1g'|awk 'END{print $0}')
     echo $LOOP_DEVICE
 
     grub-install --target=i386-pc --boot-directory=${root_folder}/bin/disk_mount/boot/ /dev/$LOOP_DEVICE
diff --git a/tools/umount_virt_disk.sh b/tools/umount_virt_disk.sh
index 30e57ed4..303ad3f4 100755
--- a/tools/umount_virt_disk.sh
+++ b/tools/umount_virt_disk.sh
@@ -5,11 +5,8 @@ if [ ! $uid == "0" ];then
  exit
 fi
 
-LOOP_DEVICE=$(lsblk | grep disk_mount)
-
-LOOP_DEVICE=${LOOP_DEVICE:2:10}
-LOOP_DEVICE=${LOOP_DEVICE%%p1*}
+LOOP_DEVICE=$(lsblk | grep disk_mount|sed 's/.*\(loop[0-9]*\)p1.*/\1/1g'|awk 'END{print $0}')
 
 umount -f ../bin/disk_mount/
 losetup -d /dev/$LOOP_DEVICE
-echo $LOOP_DEVICE
+echo $LOOP_DEVICE
\ No newline at end of file