contrib/dracut: zfs-lib: export_all: replace with inline zpool export -a

07a3312f170ac56cb480b0df9fdf4c83f116b59b, which introduced this in
October of 2014, didn't have zpool export -a available; we do

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13093

diff --git a/contrib/dracut/90zfs/export-zfs.sh.in b/contrib/dracut/90zfs/export-zfs.sh.in
index 6b711a0d151b08487398698aef12a9ce011dac16..cfe05947943639b613f91b6d267168c93851bad9 100755 (executable)
--- a/contrib/dracut/90zfs/export-zfs.sh.in
+++ b/contrib/dracut/90zfs/export-zfs.sh.in
@@ -1,10 +1,8 @@
 #!/bin/sh
 
-. /lib/dracut-zfs-lib.sh
-
 _do_zpool_export() {
        info "ZFS: Exporting ZFS storage pools..."
-       errs=$(export_all -F 2>&1)
+       errs=$(zpool export -aF 2>&1)
        ret=$?
        echo "${errs}" | vwarn
        if [ "${ret}" -ne 0 ]; then

diff --git a/contrib/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in
index 68e3f0e0d60bf847aea20b25ef5a35671ab282a8..7e11c9afdaee2e66dbe1e97595aa2c71a1663ffb 100755 (executable)
--- a/contrib/dracut/90zfs/mount-zfs.sh.in
+++ b/contrib/dracut/90zfs/mount-zfs.sh.in
@@ -44,7 +44,7 @@ if [ "${root}" = "zfs:AUTO" ] ; then
                zpool import -N -a ${ZPOOL_IMPORT_OPTS}
                if ! ZFS_DATASET="$(find_bootfs)" ; then
                        warn "ZFS: No bootfs attribute found in importable pools."
-                       export_all -F
+                       zpool export -aF
 
                        rootok=0
                        return 1

diff --git a/contrib/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in
index d7c3e96c121394a4e12c0311a6b98cfaa0b93a60..afd872d69d58e36a538dd3bb85ba53ede46d88af 100755 (executable)
--- a/contrib/dracut/90zfs/zfs-lib.sh.in
+++ b/contrib/dracut/90zfs/zfs-lib.sh.in
@@ -122,22 +122,6 @@ for_relevant_root_children() {
         )
 }
 
-# export_all OPTS
-#   exports all imported zfs pools.
-export_all() {
-    ret=0
-
-    IFS="${NEWLINE}"
-    for pool in $(zpool list -H -o name) ; do
-        if zpool list -H "${pool}" > /dev/null 2>&1; then
-            zpool export "${pool}" "$@" || ret=$?
-        fi
-    done
-    IFS="${OLDIFS}"
-
-    return "${ret}"
-}
-
 # ask_for_password
 #
 # Wraps around plymouth ask-for-password and adds fallback to tty password ask