From 9a0525912e24acf335c01a74a3c181a973fe7db0 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sat, 28 Apr 2012 15:23:10 +0100
Subject: [PATCH 505/515] lvm: Ensure LVM is initialised in non-hostonly mode.

This is a bit of a hack, but it's needed if /usr is on LVM.
---
 modules.d/90lvm/module-setup.sh          | 3 +++
 modules.d/90lvm/non-hostonly-init-lvm.sh | 8 ++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 modules.d/90lvm/non-hostonly-init-lvm.sh

diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
index 2f2b64c..fafaccd 100755
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -66,6 +66,9 @@ install() {
             sed -i -e 's/\(^[[:space:]]*\)use_lvmetad[[:space:]]*=[[:space:]]*[[:digit:]]/\1use_lvmetad = 0/' ${initdir}/etc/lvm/lvm.conf
         fi
     fi
+    if ! [[ $hostonly ]]; then
+        inst_hook pre-udev 30 "$moddir/non-hostonly-init-lvm.sh"
+    fi
 
     if ! [[ -e ${initdir}/etc/lvm/lvm.conf ]]; then
         mkdir -p "${initdir}/etc/lvm"
diff --git a/modules.d/90lvm/non-hostonly-init-lvm.sh b/modules.d/90lvm/non-hostonly-init-lvm.sh
new file mode 100644
index 0000000..2e9212c
--- /dev/null
+++ b/modules.d/90lvm/non-hostonly-init-lvm.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+printf 'cancel_wait_for_dev /dev/non-hostonly-lvm; rm "$job";' \
+    "$hookdir" >> $hookdir/initqueue/timeout/non-hostonly-lvm.sh
+
+wait_for_dev "/dev/non-hostonly-lvm"
-- 
1.9.2