From 38ccd88ced5790dc941157fed56c5ac4756acd7f Mon Sep 17 00:00:00 2001 From: Sam Chudnick Date: Thu, 16 Jun 2022 21:11:00 -0400 Subject: Added support for LUKS devices Added support for LUKS devices to mount and unmount scripts. Scripts will now detect if a device or partition is LUKS encrypted and automatically map and mount the device. --- .local/bin/dmenu/unmount-device | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to '.local/bin/dmenu/unmount-device') diff --git a/.local/bin/dmenu/unmount-device b/.local/bin/dmenu/unmount-device index 75cb10f..239663d 100755 --- a/.local/bin/dmenu/unmount-device +++ b/.local/bin/dmenu/unmount-device @@ -2,18 +2,27 @@ # Script for unmounting filesystems # Set askpass program for authentication -export SUDO_ASKPASS=/usr/bin/ssh-askpass +#export SUDO_ASKPASS=/usr/bin/ssh-askpass # Get list of unmountable filesystems excluding critical ones (/, /home, /boot, etc...) exclude="\(/\|/boot\|/boot/efi\|/var\|/tmp\|/home\)$" -parts="$(lsblk -lp | grep "part /" | grep -v "$exclude" | awk '{print $7,"-",$4}')" +parts="$(lsblk -lp | grep "\(part\|crypt\)\s*/" | grep -v "$exclude" | awk '{print $7,"-",$4}')" [ "$parts" = "" ] && exit 0 # Get filesystem to unmount from user +crypt=0 select="$(echo "$parts" | dmenu -i -p "Select filesystem to unmount" | cut -d ' ' -f 1)" [ "$select" = "" ] && exit 0 dev="$(lsblk -lp | grep "$select" | awk '{print $1}')" +[ "$(lsblk -no TYPE $dev)" = "crypt" ] && crypt=1 # Unmount the filesystem -sudo -A umount $select && pgrep -x dunst && notify-send "Unmounted $select ($dev)" \ - || notify-send "Error: unable to unmount $select" "Are you in it?" +umount=0 +sudo umount $select && pgrep -x dunst && \ + notify-send "Unmounted $select ($dev)" && umount=1 \ + || notify-send "Error: unable to unmount $select" "Are you in it?" + +[ $crypt -eq 1 -a $umount -eq 1 ] && sudo cryptsetup close $dev && pgrep -x dunst && \ + notify-send "Unmapped $dev" && exit 14 + + -- cgit v1.2.3