Index: scripts/usb_mount.sh
===================================================================
diff -u -r90da165542ff384eb8b8f19c11da62410ebf75e4 -r468de49b0616e53a79b1100d9dbc87a7ca82e2b0
--- scripts/usb_mount.sh	(.../usb_mount.sh)	(revision 90da165542ff384eb8b8f19c11da62410ebf75e4)
+++ scripts/usb_mount.sh	(.../usb_mount.sh)	(revision 468de49b0616e53a79b1100d9dbc87a7ca82e2b0)
@@ -18,12 +18,19 @@
 # $1 - usb device
 # $2 - usb drive
 # eg. sudo mount -o "noexec,sync,nodev,nosuid" /dev/sda1 /media/usb/
-sudo mount -o uid=denali,gid=denali,umask=077,noexec,sync,nodev,nosuid $1 $2
-if [ $? == 0 ]; then
-  echo ""
-  exit 0
-else
-  echo "usb drive $2 cannot be mounted."
+
+USER=root # change to leahi after Cybersecurity implementation
+mkdir -p "$2"
+if [ $? 1= 0 ]; then
+  echo "usb mount point folder '$2' cannot be made."
   exit 1001
 fi
 
+sudo mount -o uid=${USER},gid=${USER},umask=077,noexec,sync,nodev,nosuid "$1" "$2"
+if [ $? != 0 ]; then
+  echo "usb device '$1' cannot be mounted."
+  exit 1002
+fi
+
+echo ""
+exit 0
\ No newline at end of file