From 476b308f121b934859080e5ca48a93a504aadaf6 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 17 Jul 2012 16:17:42 +0200 Subject: cryptsetup: refactor the output I created a mess half-way between the legacy and the systemd outputs. Signed-off-by: Tom Gundersen --- rc.sysinit | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'rc.sysinit') 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 -- cgit v1.2.3-54-g00ecf