Minor bugfix and increased verbosity

diff --git a/files/mount-media b/files/mount-media
index b4506052136ec8f08d25a08909522f492fad82cf..a6ef5b66594261b48e1f2be23b82f5c6075afbec 100755 (executable)
--- a/files/mount-media
+++ b/files/mount-media
@@ -7,7 +7,7 @@
 MEDIA="$1"
 VOLUME="$2"
 BASENAME="`basename $0`"
-DISK="`echo ${MEDIA} | sed -e s/[0-9]\$//g`"
+MOUNTPOINT="/media/usb"
 
 # Check media config
 if [ -z "$MEDIA" ]; then
@@ -21,16 +21,22 @@ if [ -z "$VOLUME" ]; then
   VOLUME="sdb1"
 fi
 
+DISK="`echo ${VOLUME} | sed -e s/[0-9]\$//g`"
+
 # Set sudo config
 if [ "`whoami`" != 'root' ]; then
   sudo="sudo"
 fi
 
 if [ "$BASENAME" == "mount-media" ]; then
+  echo "Disabling STANDBY on drive..."
   $sudo sdparm --clear STANDBY -6 /dev/$DISK
+  echo "Initializing crypto layer..."
   $sudo cryptsetup luksOpen /dev/$VOLUME $MEDIA && \
+  echo "Checking filesystem..."
   $sudo fsck -v -y /dev/mapper/$MEDIA && \
-  $sudo mount /dev/mapper/$MEDIA /media/usb
+  echo "Mounting volume at $MOUNTPOINT"
+  $sudo mount /dev/mapper/$MEDIA $MOUNTPOINT"
 elif [ "$BASENAME" == "umount-media" ]; then
   $sudo umount /media/usb && \
   $sudo cryptsetup luksClose $MEDIA