diff options
Diffstat (limited to 'rc.shutdown')
| -rwxr-xr-x | rc.shutdown | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/rc.shutdown b/rc.shutdown index 2d79379..d569dd2 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -6,6 +6,9 @@ . /etc/rc.conf . /etc/rc.d/functions +# don't let all the systemd tools be too verbose +export SYSTEMD_LOG_LEVEL="notice" + # avoid staircase effect stty onlcr @@ -55,20 +58,10 @@ run_hook shutdown_postumount # Kill non-root encrypted partition mappings if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then - stat_busy "Deactivating encrypted volumes" - # Maybe someone has LVM on an encrypted block device - # executing an extra vgchange is errorless - [[ $USELVM = [Yy][Ee][Ss] ]] && vgchange --sysinit -a n &>/dev/null - do_lock() { - stat_append "${1}.." - if cryptsetup remove "$1" &>/dev/null; then - stat_append "ok " - else - stat_append "failed " - fi - } - read_crypttab do_lock - stat_done + # Maybe someone has LVM on an encrypted block device + # executing an extra vgchange is errorless + [[ $USELVM = [Yy][Ee][Ss] ]] && vgchange --sysinit -a n &>/dev/null + read_crypttab do_lock fi [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) ]] && |