Import ZFS volumes after luks. Ref: Sabayon#25

alinefr · Mar 6, 2016 · 489f9fe · 489f9fe
1 parent 386a0ad
commit 489f9fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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