mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-20 21:43:11 +00:00
ba4fcefcea
Currently, /media is mounted once per boot, which causes issues if a user need to change USB sticks, or unknowning performs an operation that mounts /media and then needs to access a different USB stick later (eg, updating the firmware). To mitigate this, always unmount /media if mounted before scanning for USB devices, so the user can choose the correct device at the time of its use. Additionally, add a unique exit code for user abort so we're not treating it the same as a failure, and use it to prevent unnecessary GUI prompts when cancelling selection of a USB device. Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
113 lines
3.2 KiB
Bash
Executable File
113 lines
3.2 KiB
Bash
Executable File
#!/bin/sh
|
|
# Mount a USB device
|
|
. /etc/functions
|
|
|
|
enable_usb
|
|
|
|
if ! lsmod | grep -q usb_storage; then
|
|
count=$(ls /dev/sd* 2>/dev/null | wc -l)
|
|
timeout=0
|
|
echo "Scanning for USB storage devices..."
|
|
insmod /lib/modules/usb-storage.ko >/dev/null 2>&1 \
|
|
|| die "usb_storage: module load failed"
|
|
while [[ $count == $(ls /dev/sd* 2>/dev/null | wc -l) ]]; do
|
|
[[ $timeout -ge 4 ]] && break
|
|
sleep 1
|
|
timeout=$(($timeout+1))
|
|
done
|
|
fi
|
|
|
|
if [ ! -d /media ]; then
|
|
mkdir /media
|
|
fi
|
|
|
|
stat -c %N /sys/block/sd* 2>/dev/null | grep usb | cut -f1 -d ' ' | sed "s/[']//g;s|/sys/block|/dev|" > /tmp/usb_block_devices
|
|
if [ -z `cat /tmp/usb_block_devices` ]; then
|
|
if [ -x /bin/whiptail ]; then
|
|
whiptail --title 'USB Drive Missing' \
|
|
--msgbox "Insert your USB drive and press Enter to continue." 16 60
|
|
else
|
|
echo "+++ USB Drive Missing! Insert your USB drive and press Enter to continue."
|
|
read
|
|
fi
|
|
sleep 1
|
|
stat -c %N /sys/block/sd* 2>/dev/null | grep usb | cut -f1 -d ' ' | sed "s/[']//g;s|/sys/block|/dev|" > /tmp/usb_block_devices
|
|
if [ -z `cat /tmp/usb_block_devices` ]; then
|
|
if [ -x /bin/whiptail ]; then
|
|
whiptail $CONFIG_ERROR_BG_COLOR --title 'ERROR: USB Drive Missing' \
|
|
--msgbox "USB Drive Missing! Aborting mount attempt.\n\nPress Enter to continue." 16 60
|
|
else
|
|
echo "!!! ERROR: USB Drive Missing! Aborting mount. Press Enter to continue."
|
|
fi
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
USB_MOUNT_DEVICE=""
|
|
# Check for the common case: a single USB disk with one partition
|
|
if [ `cat /tmp/usb_block_devices | wc -l` -eq 1 ]; then
|
|
USB_BLOCK_DEVICE=`cat /tmp/usb_block_devices`
|
|
# Subtract out block device
|
|
let USB_NUM_PARTITIONS=`ls -1 ${USB_BLOCK_DEVICE}* | wc -l`-1
|
|
if [ ${USB_NUM_PARTITIONS} -eq 0 ]; then
|
|
USB_MOUNT_DEVICE=${USB_BLOCK_DEVICE}
|
|
elif [ ${USB_NUM_PARTITIONS} -eq 1 ]; then
|
|
USB_MOUNT_DEVICE=`ls -1 ${USB_BLOCK_DEVICE}* | tail -n1`
|
|
fi
|
|
fi
|
|
# otherwise, let the user pick
|
|
if [ -z ${USB_MOUNT_DEVICE} ]; then
|
|
> /tmp/usb_disk_list
|
|
for i in `cat /tmp/usb_block_devices`; do
|
|
# remove block device from list if numeric partitions exist, since not bootable
|
|
let USB_NUM_PARTITIONS=`ls -1 $i* | wc -l`-1
|
|
if [ ${USB_NUM_PARTITIONS} -eq 0 ]; then
|
|
echo $i >> /tmp/usb_disk_list
|
|
else
|
|
ls $i* | tail -${USB_NUM_PARTITIONS} >> /tmp/usb_disk_list
|
|
fi
|
|
done
|
|
|
|
if [ -x /bin/whiptail ]; then
|
|
MENU_OPTIONS=""
|
|
n=0
|
|
while read option
|
|
do
|
|
n=`expr $n + 1`
|
|
option=$(echo $option | tr " " "_")
|
|
MENU_OPTIONS="$MENU_OPTIONS $n ${option}"
|
|
done < /tmp/usb_disk_list
|
|
|
|
MENU_OPTIONS="$MENU_OPTIONS a Abort"
|
|
whiptail --clear --title "Select your USB disk" \
|
|
--menu "Choose your USB disk [1-$n, a to abort]:" 20 120 8 \
|
|
-- $MENU_OPTIONS \
|
|
2>/tmp/whiptail
|
|
|
|
option_index=$(cat /tmp/whiptail)
|
|
else
|
|
echo "+++ Select your USB disk:"
|
|
n=0
|
|
while read option
|
|
do
|
|
n=`expr $n + 1`
|
|
echo "$n. $option"
|
|
done < /tmp/usb_disk_list
|
|
|
|
read \
|
|
-p "Choose your USB disk [1-$n, a to abort]: " \
|
|
option_index
|
|
fi
|
|
|
|
if [ "$option_index" = "a" ]; then
|
|
exit 5
|
|
fi
|
|
USB_MOUNT_DEVICE=`head -n $option_index /tmp/usb_disk_list | tail -1`
|
|
fi
|
|
|
|
if [ "$1" = "rw" ]; then
|
|
mount -o rw $USB_MOUNT_DEVICE /media
|
|
else
|
|
mount -o ro $USB_MOUNT_DEVICE /media
|
|
fi
|