From: Renaud Métrich <rmetrich@redhat.com>
Date: Fri, 1 Mar 2019 10:46:43 +0000 (+0100)
Subject: iscsi: always popd, even if there is no iscsi device
X-Git-Tag: 050~230
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fdracut.git;a=commitdiff_plain;h=33cfad0b8f31a8241003b8f7728a2dc1ef61ca41

iscsi: always popd, even if there is no iscsi device
---

diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index 4b6c4a3c8..8b224be31 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -22,8 +22,10 @@ check() {
 
     [[ $hostonly ]] || [[ $mount_needs ]] && {
         pushd . >/dev/null
-        for_each_host_dev_and_slaves is_iscsi || return 255
+        for_each_host_dev_and_slaves is_iscsi
+        local _is_iscsi=$?
         popd >/dev/null
+        [[ $_is_iscsi == 0 ]] || return 255
     }
     return 0
 }