From 8dcc8d0e030aa4b84f02d1a862335afd74b772e8 Mon Sep 17 00:00:00 2001
From: Ian-Xue Li <da.mi.spirit@gmail.com>
Date: Sat, 30 Apr 2011 21:16:09 +0200
Subject: rc.shutdown should recognize LVM upon LUKS option

This fixes FS#23889.

Signed-off-by: Tom Gundersen <teg@jklm.no>
---
 rc.shutdown | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'rc.shutdown')

diff --git a/rc.shutdown b/rc.shutdown
index ec5fb9b..a78bc4d 100755
--- a/rc.shutdown
+++ b/rc.shutdown
@@ -65,6 +65,11 @@ stat_done
 # Kill non-root encrypted partition mappings
 if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then
 	stat_busy "Deactivating encrypted volumes:"
+	# Maybe someone has LVM on an encrypted block device
+	# executing an extra vgchange is errorless
+	if [[ $USELVM =~ yes|YES ]]; then
+		/sbin/vgchange --sysinit -a n >/dev/null 2>&1
+	fi
 	do_lock() {
 		stat_append "${1}.."
 		if $CS remove "$1" >/dev/null 2>&1; then
-- 
cgit v1.2.3