initrd.scripts: move zfs_real_root_init outside real_root_init

12 years ago · 9d66471c26
parent 6b29188ee3
commit 9d66471c26
2 changed files with 3 additions and 4 deletions
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@ -22,9 +22,6 @@ real_root_init() {
    if [ -z "${REAL_ROOTFLAGS}" ]; then
        REAL_ROOTFLAGS="${FAKE_ROOTFLAGS}"
    fi
-
-    # let zfs code setup its parameters
-    zfs_real_root_init
 }

 bootstrap_key() {
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@ -240,7 +240,9 @@ done

 quiet_kmsg

-is_livecd || real_root_init
+is_livecd || {
+    real_root_init && zfs_real_root_init;
+}

 cmdline_hwopts