summaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2011-01-28 20:58:45 +0100
committerThomas Bächler <thomas@archlinux.org>2011-01-28 20:58:45 +0100
commitc44eccadf84ba0d9d0d449a870aad63bb03fd8d3 (patch)
treeb6420d5bdc4a489daf5b5458425724385bef5bcf /rc.sysinit
parentf4703f832e6d8578c52dd8a71b9bf34894fe3d34 (diff)
Only call activate_vgs a second time if any logical volumes have actually been activated.
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit7
1 files changed, 5 insertions, 2 deletions
diff --git a/rc.sysinit b/rc.sysinit
index d562e36..3ed61c7 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -202,13 +202,16 @@ if [[ -f /etc/crypttab && $CS ]]; then
fi
return $failed
}
+ crypto_unlocked=0
if read_crypttab do_unlock; then
stat_done
else
stat_fail
fi
- # Maybe someone has LVM on an encrypted block device
- activate_vgs
+ if [[ ${crypto_unlocked} -eq 1 ]]; then
+ # Maybe someone has LVM on an encrypted block device
+ activate_vgs
+ fi
fi
status "Mounting Root Read-only" /bin/mount -n -o remount,ro /