From: Daniel Molkentin <dmolkentin@suse.com>
Date: Tue, 24 Jul 2018 16:02:50 +0000 (+0200)
Subject: Merge tag '048' into SUSE/048
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=181533fc9edc51a737c62d4e2ce7f6c111219ad5;p=thirdparty%2Fdracut.git

Merge tag '048' into SUSE/048

version 48
---

181533fc9edc51a737c62d4e2ce7f6c111219ad5
diff --cc modules.d/95iscsi/iscsiroot.sh
index 3a2463f54,5ac0ad9a8..b25b348f0
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@@ -41,14 -41,7 +41,6 @@@ if [ -z "${DRACUT_SYSTEMD}" ] && [ -e /
          > /tmp/iscsiuio-started
  fi
  
- #set value for initial login retry
- set_login_retries() {
-     local default retries
-     default=2
-     retries=$(getarg rd.iscsilogin.retries)
-     return ${retries:-$default}
- }
--
  handle_firmware()
  {
      local ifaces retry