mount from bare usb device if mount fails

If mounting the discovered USB device fails during install, try again mounting the bare device, i.e. /dev/sdb3 -> /dev/sdb.
Confusingboat · Jul 29, 2020 · 4c68a32 · 4c68a32
1 parent 1688b71
commit 4c68a32
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/install.sh b/install.sh
@@ -30,7 +30,7 @@ cleanup2()
  umount ${TARGET} || true
  fi
 
- losetup -d ${ISO_DEVICE} || true
+ losetup -d ${ISO_DEVICE} || losetup -d ${ISO_DEVICE%?} || true
  umount $DISTRO || true
 }
 
@@ -116,8 +116,8 @@ do_mount()
  mount ${BOOT} ${TARGET}/boot/efi
  fi
 
- mkdir -p $DISTRO
- mount -o ro $ISO_DEVICE $DISTRO
+ mkdir -p ${DISTRO}
+ mount -o ro ${ISO_DEVICE} ${DISTRO} || mount -o ro ${ISO_DEVICE%?} ${DISTRO}
 }
 
 do_copy()