--- rc.sysinit	2006-09-10 17:49:45.000000000 +0100
+++ /etc/rc.sysinit	2006-09-10 17:54:49.000000000 +0100
@@ -86,7 +86,9 @@
 fi
 
 # Set up non-root encrypted partition mappings
-if [ -f /etc/crypttab ]; then
+if [ -f /etc/crypttab ] && grep -qv '^\(#\|$\)' /etc/crypttab; then
+	stat_busy "Setting up encrypted partitions"
+	fail=0
 	CS=/sbin/cryptsetup.static
 	while read line; do
 		[ "$line" = "" ] && continue
@@ -108,18 +110,23 @@
 			# For some fun reason, the parameter ordering varies for
 			# LUKS and non-LUKS devices.  Joy.
 			if `$CS isLuks $csrc 2>/dev/null`; then
-				echo "$cpass2" | $CS $copts luksOpen $csrc $cname >/dev/null
+				echo "$cpass2" | $CS $copts luksOpen $csrc $cname >/dev/null 2>&1 || fail=1
 			else
-				echo "$cpass2" | $CS $copts create $cname $csrc >/dev/null
+				echo "$cpass2" | $CS $copts create $cname $csrc >/dev/null 2>&1 || fail=1
 			fi
 		else
 			if `$CS isLuks $csrc 2>/dev/null`; then
-				$CS -d $cpass $copts luksOpen $csrc $cname >/dev/null
+				$CS -d $cpass $copts luksOpen $csrc $cname >/dev/null 2>&1 || fail=1
 			else
-				$CS -d $cpass $copts create $cname $csrc >/dev/null
+				$CS -d $cpass $copts create $cname $csrc >/dev/null 2>&1 || fail=1
 			fi
 		fi
 	done </etc/crypttab
+	if [ $fail -eq 0 ]; then
+		stat_done
+	else
+		stat_fail
+	fi
 fi
 
 if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then