iscsi: s/rd.iscsilogin.retries/rd.iscsi.login_retry_max

diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index 2e7f5f23aae40ff4e73c2baff29118f98da72566..9252d253b21a5a9e23d626056e399b18f17f9926 100644 (file)
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -734,6 +734,9 @@ You may want to use rd.iscsi.firmware.
 **root=**_???_ **netroot=**iscsi **rd.iscsi.firmware=1**::
  will read the iscsi parameter from the BIOS firmware
 
+**rd.iscsi.login_retry_max=**__<num>__::
+    maximum number of login retries
+
 **rd.iscsi.param=**__<param>__::
     <param> will be passed as "--param <param>" to iscsistart.
     This parameter can be specified multiple times.

diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
index 0643d8d86cdd545dc113cbe5f5cfdb5bb8c86bf2..5ac0ad9a83708890541c9dadd6e0f1f80a62eeb1 100755 (executable)
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -41,13 +41,6 @@ if [ -z "${DRACUT_SYSTEMD}" ] && [ -e /sys/module/bnx2i ] && ! [ -e /tmp/iscsiui
         > /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()
 {
@@ -130,8 +123,7 @@ handle_netroot()
     case "$iscsi_param" in
         *node.session.initial_login_retry_max*) ;;
         *)
-            set_login_retries
-            retries=$?
+            retries=$(getargnum 3 0 10000 rd.iscsi.login_retry_max)
             if [ $retries -gt 0 ]; then
                 iscsi_param="${iscsi_param% } node.session.initial_login_retry_max=$retries"
             fi