]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
Fix syncheck complaints
authorDaniel Molkentin <dmolkentin@suse.com>
Tue, 22 May 2018 11:55:00 +0000 (13:55 +0200)
committerHarald Hoyer <harald@redhat.com>
Wed, 4 Jul 2018 11:05:56 +0000 (13:05 +0200)
modules.d/95iscsi/iscsiroot.sh

index 3a2463f547d93218c6544d0f116cf8945a26c4d4..a71cbcd3807c1c91c795777f1cd24a46bd3c69ea 100755 (executable)
@@ -127,13 +127,16 @@ handle_netroot()
     fi
 
     #limit iscsistart login retries
-    if [[ ! "$iscsi_param" =~ "node.session.initial_login_retry_max" ]]; then
-        set_login_retries
-        retries=$?
-        if [ $retries -gt 0 ]; then
-            iscsi_param="${iscsi_param% } node.session.initial_login_retry_max=$retries"
-        fi
-    fi
+    case "$iscsi_param" in
+        *node.session.initial_login_retry_max*) ;;
+        *)
+            set_login_retries
+            retries=$?
+            if [ $retries -gt 0 ]; then
+                iscsi_param="${iscsi_param% } node.session.initial_login_retry_max=$retries"
+            fi
+        ;;
+    esac
 
 # XXX is this needed?
     getarg ro && iscsirw=ro
@@ -223,7 +226,8 @@ handle_netroot()
     fi
 
     for target in $iscsi_target_name; do
-        if [[ "$targets" =~ "$target" ]]; then
+        case "$targets" in
+        *$target*)
             if [ -n "$iscsi_iface_name" ]; then
                 $(iscsiadm -m iface -I $iscsi_iface_name --op=new)
                 [ -n "$iscsi_initiator" ] && $(iscsiadm -m iface -I $iscsi_iface_name --op=update --name=iface.initiatorname --value=$iscsi_initiator)
@@ -238,7 +242,10 @@ handle_netroot()
             [ -n "$iscsi_in_username" ] && $($COMMAND --name=node.session.auth.username_in --value=$iscsi_in_username)
             [ -n "$iscsi_in_password" ] && $($COMMAND --name=node.session.auth.password_in --value=$iscsi_in_password)
             [ -n "$iscsi_param" ] && for param in $iscsi_param; do $($COMMAND --name=${param%=*} --value=${param#*=}); done
-        fi
+        ;;
+        *)
+        ;;
+        esac
     done
 
     iscsiadm -m node -L onboot || :