Rewrite /etc/crypttab processing.

Split out reading /etc/crypttab and procssing the individual lines into
their own helper functions, and bashify the resulting shorter code.

Processing this file is still ugly, though. :(

1 files changed, 11 insertions, 27 deletions

diff --git a/rc.shutdown b/rc.shutdown
index 07061e8..84003dd 100755
--- a/rc.shutdown
+++ b/rc.shutdown
@@ -65,34 +65,18 @@ stat_busy "Unmounting Filesystems"
 stat_done
 
 # Kill non-root encrypted partition mappings
-if [[ -f /etc/crypttab ]]; then
+if [[ -f /etc/crypttab && $CS ]]; then
 	stat_busy "Deactivating encrypted volumes:"
-	# Arch cryptsetup packages traditionally contained the binaries
-	#  /usr/sbin/cryptsetup
-	#  /sbin/cryptsetup.static
-	# By default, initscripts used the /sbin/cryptsetup.static.
-	# Newer packages will only have /sbin/cryptsetup and no static binary
-	# This ensures maximal compatibility with the old and new layout
-        for CS in /sbin/cryptsetup /usr/sbin/cryptsetup \
-            /sbin/cryptsetup.static ''; do
-            [[ -x $CS ]] && break
-        done
-        if [[ ! $CS ]]; then
-            stat_append " Failed, unable to find cryptsetup."
-            stat_fail
-	else
-            while read name src passwd opts; do
-                [[ ! $name || ${name:0:1} = '#']] && continue
-                [[ -b /dev/mapper/$name ]] || continue
-		stat_append "${1}.."
-		if "$CS" remove "$name" >/dev/null 2>&1; then
-		    stat_append "ok "
-                else
-		    stat_append "failed "
-		fi
-	    done </etc/crypttab
-        fi
-        stat_done
+	do_lock() {
+            stat_append "${1}.."
+            if $CS remove "$1" >/dev/null 2>&1; then
+                stat_append "ok "
+	    else
+                stat_append "failed "
+	    fi
+        }
+        read_crypttab do_lock
+	stat_done
 fi
 
 if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then