Activate LVM volume groups before looking for zpools.

Original-patch-by: @jgoerzen
Signed-off-by: Benjamin Albrecht <git@albrecht.io>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes zfsonlinux/pkg-zfs#102
Closes #4029

diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index fa2b5a28364f490a533547deb13c42f084b686ce..998e588aba7209b444e06b5daf70341d8cd46dfd 100644 (file)
--- a/contrib/initramfs/Makefile.am
+++ b/contrib/initramfs/Makefile.am
@@ -1,15 +1,16 @@
 initrddir = $(datarootdir)/initramfs-tools
 
-initrd_SCRIPTS = conf-hooks.d/zfs hooks/zfs scripts/zfs
+initrd_SCRIPTS = conf-hooks.d/zfs hooks/zfs scripts/zfs scripts/local-top/zfs
 
 EXTRA_DIST = \
        $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \
        $(top_srcdir)/contrib/initramfs/hooks/zfs \
        $(top_srcdir)/contrib/initramfs/scripts/zfs \
+       $(top_srcdir)/contrib/initramfs/scripts/local-top/zfs \
        $(top_srcdir)/contrib/initramfs/README.initramfs.markdown
 
 install-initrdSCRIPTS: $(EXTRA_DIST)
-       for d in conf-hooks.d hooks scripts; do \
+       for d in conf-hooks.d hooks scripts scripts/local-top; do \
          $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \
          cp $(top_srcdir)/contrib/initramfs/$$d/zfs \
            $(DESTDIR)$(initrddir)/$$d/; \

diff --git a/contrib/initramfs/scripts/local-top/zfs b/contrib/initramfs/scripts/local-top/zfs
new file mode 100755 (executable)
index 0000000..f09b2c8
--- /dev/null
+++ b/contrib/initramfs/scripts/local-top/zfs
@@ -0,0 +1,60 @@
+#!/bin/sh
+PREREQ="mdadm mdrun multipath"
+
+prereqs()
+{
+        echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+        prereqs
+        exit 0
+        ;;
+esac
+
+
+#
+# Helper functions
+#
+message()
+{
+        if [ -x /bin/plymouth ] && plymouth --ping; then
+                plymouth message --text="$@"
+        else
+                echo "$@" >&2
+        fi
+        return 0
+}
+
+udev_settle()
+{
+        # Wait for udev to be ready, see https://launchpad.net/bugs/85640
+        if [ -x /sbin/udevadm ]; then
+                /sbin/udevadm settle --timeout=30
+        elif [ -x /sbin/udevsettle ]; then
+                /sbin/udevsettle --timeout=30
+        fi
+        return 0
+}
+
+
+activate_vg()
+{
+        # Sanity checks
+        if [ ! -x /sbin/lvm ]; then
+                message "lvm is not available"
+                return 1
+        fi
+
+        # Detect and activate available volume groups
+        /sbin/lvm vgscan
+        /sbin/lvm vgchange -a y --sysinit
+        return $?
+}
+
+udev_settle
+activate_vg
+
+exit 0