From 489f9fe3c3066d86b1de78b102bf6144156621a3 Mon Sep 17 00:00:00 2001
From: Aline Freitas <aline@alinefreitas.com.br>
Date: Sun, 28 Feb 2016 15:29:54 -0300
Subject: [PATCH] Import ZFS volumes after luks. Ref: Sabayon/genkernel-next#25

---
 defaults/initrd.d/00-zfs.sh | 4 ++--
 defaults/linuxrc            | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/defaults/initrd.d/00-zfs.sh b/defaults/initrd.d/00-zfs.sh
index 8d44d174..76c4f324 100755
--- a/defaults/initrd.d/00-zfs.sh
+++ b/defaults/initrd.d/00-zfs.sh
@@ -85,7 +85,7 @@ zfs_start_volumes() {
         if [ "${?}" = "0" ]; then
             good_msg "Importing ZFS pools succeeded"
         else
-            bad_msg "Imported ZFS pools failed"
+            warn_msg "Imported ZFS pools failed"
         fi
 
     else
@@ -105,7 +105,7 @@ zfs_start_volumes() {
             if [ "${?}" = "0" ]; then
                 good_msg "Import of ${ZFS_POOL} succeeded"
             else
-                bad_msg "Import of ${ZFS_POOL} failed"
+                warn_msg "Import of ${ZFS_POOL} failed"
             fi
         fi
     fi
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 8cfb213d..014e30d8 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -302,6 +302,9 @@ setup_keymap
 # Initialize LUKS root device except for livecd's
 is_livecd || start_luks
 
+start_volumes
+zfs_start_volumes
+
 # Initialize resume from hibernation
 is_livecd || resume_init