contrib/dracut: zfs-lib: export_all: replace with inline zpool export -a
07a3312f17
, 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
This commit is contained in:
parent
93669c3812
commit
6a41310c70
contrib/dracut/90zfs
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue