aboutsummaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-07-17 14:17:42 (GMT)
committerTom Gundersen <teg@jklm.no>2012-07-17 14:42:36 (GMT)
commit476b308f121b934859080e5ca48a93a504aadaf6 (patch)
tree56f5c908adcc30d0e8bc09bbd1ba13dd36bc7131 /rc.sysinit
parent275e04adec75fe9faff246bf893842da1d6d829d (diff)
downloadinitscripts-476b308f121b934859080e5ca48a93a504aadaf6.tar.xz
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>
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit6
1 files changed, 2 insertions, 4 deletions
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