Shutdown tweaks, automated mount, and varibale cleanupv1.0

Since not all init processes allow for something like crypttab to be
executed before the mount command to mount filesystems in /etc/fstab,
added a mount -a command to ensure the crypted filesystems are mounted
on setup.

Added a process kill on stop to ensure the filesystems are freed to
unmount and decrypt before shutting down.

Renamed some ambiguous 'i' variables to 'entry' for clarification.

1 files changed, 17 insertions, 7 deletions

diff --git a/crypttab b/crypttab
index a6a3b2d..c8bfae6 100755
--- a/crypttab
+++ b/crypttab
@@ -20,18 +20,27 @@ function destroy_entries {
   fi
 
   # For each entry in crypttab
-  for i in "$(cat ${tab})"; do
-    name=$(echo ${i} | tr -s ' ' | cut -d ' ' -f 1)
+  for entry in "$(cat ${tab})"; do
+    local name=${entry%% *}
 
     # Unmount all mountpoins if mounted anywhere
     # Cryptsetup luksClose will repeatedly fail if the devices is mounted
     # anywhere, causing shutdowns to hang up.
     for i in "$(mount | grep /dev/mapper/${name})"; do
-      mntpoint=$(echo ${i} | tr -s ' ' | cut -d ' ' -f 3)
+      local mntpoint=$(echo ${i} | tr -s ' ' | cut -d ' ' -f 3)
       # Skip if empty
       [[ ${mntpoint} == '' ]] && continue
 
       echo "${name} mounted at ${mntpoint}. Unmounting"
+
+      # Kill any running processes accessing mntpoint
+      for pid in $(lsof -t ${mntpoint}); do
+        pidstr=$(ps -f ${pid} | tail -n 1)
+        echo "Halting ${pid} ${pidstr##* }"
+        kill ${pid}
+      done
+
+      # Unmount
       umount ${mntpoint}
     done
 
@@ -72,10 +81,10 @@ function setup_entries {
     exit 1
   fi
 
-  for i in "$(cat ${tab})"; do
-    name=$(echo ${i} | tr -s ' ' | cut -d ' ' -f 1)
-    dev=$(echo ${i} | tr -s ' ' | cut -d ' ' -f 2)
-    key=$(echo ${i} | tr -s ' ' | cut -d ' ' -f 3)
+  for entry in "$(cat ${tab})"; do
+    name=$(echo ${entry} | tr -s ' ' | cut -d ' ' -f 1)
+    dev=$(echo ${entry} | tr -s ' ' | cut -d ' ' -f 2)
+    key=$(echo ${entry} | tr -s ' ' | cut -d ' ' -f 3)
   
     echo "Decrypting ${dev} using key ${key}."
     echo "Plaintext device is at /dev/mapper/${name}"
@@ -87,6 +96,7 @@ function setup_entries {
 case $1 in
 start)
   setup_entries
+  mount -a
   ;;
 stop)
   destroy_entries