Merge tag '048' into SUSE/048

version 48

diff --cc modules.d/40network/ifup.sh
Simple merge

diff --cc modules.d/40network/net-lib.sh
Simple merge

diff --cc modules.d/95iscsi/iscsiroot.sh
index 3a2463f547d93218c6544d0f116cf8945a26c4d4,5ac0ad9a83708890541c9dadd6e0f1f80a62eeb1..b25b348f0bcdc33a4b99d393779d6e2b0afb85f1
--- 1/modules.d/95iscsi/iscsiroot.sh
--- 2/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