cryptsetup: refactor the output

I created a mess half-way between the legacy and the systemd outputs.

Signed-off-by: Tom Gundersen <teg@jklm.no>

2 files changed, 12 insertions, 20 deletions

diff --git a/functions b/functions
index 36cfd30..9b8d805 100644
--- a/functions
+++ b/functions
@@ -386,8 +386,7 @@ do_unlock_legacy() {
 	# $2 = source device
 	# $3 = password
 	# $4 = options
-	stat_append "${1}.."
-	printf "${C_FAIL}Using legacy crypttab format. This will stop working in the future. See crypttab(5).${C_OTHER}\n"
+	printf "${C_FAIL}Using legacy crypttab format. This will stop working in the future. See crypttab(5).${C_CLEAR}\n"
 	local open=create a=$1 b=$2 failed=0
 	# Ordering of options is different if you are using LUKS vs. not.
 	# Use ugly swizzling to deal with it.
@@ -416,7 +415,7 @@ do_unlock_legacy() {
 			if (( _overwriteokay == 0 )); then
 				false
 			elif cryptsetup -d /dev/urandom $4 $open "$a" "$b" >/dev/null; then
-				stat_append "creating swapspace.."
+				printf "creating swapspace..\n"
 				mkswap -f -L $1 /dev/mapper/$1 >/dev/null
 			fi;;
 		ASK)
@@ -451,18 +450,12 @@ do_unlock_legacy() {
 		*)
 			echo "$3" | cryptsetup $4 $open "$a" "$b" >/dev/null;;
 	esac
-	if (( $? )); then
-		failed=1
-		stat_append "failed "
-	else
-		stat_append "ok "
-	fi
-	return $failed
+	return $?
 }
 
 do_unlock_systemd() {
-	stat_append "${1}.."
 	local failed=0
+
 	if ! /usr/lib/systemd/systemd-cryptsetup attach "$1" "$2" "$3" $4; then
 		failed=1
 	else
@@ -480,17 +473,14 @@ do_unlock_systemd() {
 			fi
 		fi
 	fi
-	if (( $failed )); then
-		stat_append "failed "
-	else
-		stat_append "ok "
-	fi
 	return $failed
 }
 
 do_unlock() {
 	local name=$1 device=$2 password=$3 options=$4
 
+	printf "${C_MAIN}Unlocking $1${C_CLEAR}\n"
+
 	if [[ ${options:0:2} =~ -. ]]; then
 		do_unlock_legacy "$name" "$device" "$password" "$options"
 		return $?
@@ -514,6 +504,10 @@ do_unlock() {
 			do_unlock_legacy "$name" "$device" "$password" "$options"
 			;;
 	esac
+	failed=$?
+	if (( $failed )); then
+		printf "${C_FAIL}Unlocking of $1 failed.${C_CLEAR}\n"
+	fi
 	return $?
 }
 
diff --git a/rc.sysinit b/rc.sysinit
index 0514343..c031531 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -87,11 +87,9 @@ activate_vgs
 
 # Set up non-root encrypted partition mappings
 if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then
-	stat_busy "Unlocking encrypted volumes"
-	crypto_unlocked=0
-	read_crypttab do_unlock && stat_done || stat_fail
+	read_crypttab do_unlock
 	# Maybe someone has LVM on an encrypted block device
-	(( crypto_unlocked )) && activate_vgs
+	(( $? )) && activate_vgs
 fi
 
 # Check filesystems