contrib/dracut: export-zfs: simplify

Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#13093
andrewc12 · Sep 23, 2022 · 009dd06 · 009dd06
1 parent 5c51922
commit 009dd06
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/contrib/dracut/90zfs/export-zfs.sh.in b/contrib/dracut/90zfs/export-zfs.sh.in
@@ -3,28 +3,22 @@
 . /lib/dracut-zfs-lib.sh
 
 _do_zpool_export() {
-	ret=0
-	errs=""
-	final="${1}"
-
 	info "ZFS: Exporting ZFS storage pools..."
 	errs=$(export_all -F 2>&1)
 	ret=$?
-	[ -z "${errs}" ] || echo "${errs}" | vwarn
-	if [ "x${ret}" != "x0" ]; then
+	echo "${errs}" | vwarn
+	if [ "${ret}" -ne 0 ]; then
 		info "ZFS: There was a problem exporting pools."
 	fi
 
-	if [ "x${final}" != "x" ]; then
+	if [ -n "$1" ]; then
 		info "ZFS: pool list"
 		zpool list 2>&1 | vinfo
 	fi
 
-	return "${ret}"
+	return "$ret"
 }
 
 if command -v zpool >/dev/null; then
 	_do_zpool_export "${1}"
-else
-	:
 fi