From c4f66215ed3fc9dba67241feb404d271a689030c Mon Sep 17 00:00:00 2001 From: "Kurt J. Bosch" Date: Sat, 25 Jun 2011 10:04:23 +0200 Subject: Move activate_vgs and crypt stat_busy to the top for consistency --- functions | 2 +- rc.sysinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functions b/functions index 14b7a7b..861fcbe 100644 --- a/functions +++ b/functions @@ -326,8 +326,8 @@ udevd_modprobe() { activate_vgs() { [[ $USELVM = [yY][eE][sS] && -x $(type -P lvm) && -d /sys/block ]] || return # Kernel 2.6.x, LVM2 groups - /sbin/modprobe -q dm-mod 2>/dev/null stat_busy "Activating LVM2 groups" + /sbin/modprobe -q dm-mod 2>/dev/null /sbin/vgchange --sysinit -a y >/dev/null (( $? == 0 )) && stat_done || stat_fail } diff --git a/rc.sysinit b/rc.sysinit index 3fe7185..b34d4ad 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -91,8 +91,8 @@ activate_vgs # Set up non-root encrypted partition mappings if [[ -f /etc/crypttab && $CS ]] && grep -q ^[^#] /etc/crypttab; then - modprobe -q dm-crypt 2>/dev/null stat_busy "Unlocking encrypted volumes:" + modprobe -q dm-crypt 2>/dev/null do_unlock() { # $1 = requested name # $2 = source device -- cgit v1.2.3