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