Merge pull request #19 from gabi2/master

allow non-standard iqn (bnc #868220)
yast · Apr 1, 2014 · 3669531 · 3669531
2 parents 7f4f75d + f71cbc7
commit 3669531
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/package/yast2-iscsi-client.changes b/package/yast2-iscsi-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  1 11:25:37 CEST 2014 - gs@suse.de
+
+- allow non-standard iqn (bnc #868220)
+
 -------------------------------------------------------------------
 Fri Mar 14 10:47:43 CET 2014 - gs@suse.de
 

diff --git a/src/include/iscsi-client/widgets.rb b/src/include/iscsi-client/widgets.rb
@@ -419,7 +419,7 @@ def validateInitName(key, event)
         Builtins.regexpmatch(i_name, Builtins.sformat("^eui.%1%2$", reg1, reg2))
 
       if !correct
-        Popup.Warning(
+        continue = Popup.ContinueCancel(
           _(
             "Incorrect InitiatorName.\n" +
               "The correct syntax is\n" +
@@ -430,9 +430,10 @@ def validateInitName(key, event)
               "iqn.2007-04.cz.server:storage.disk.sdb\n"
           )
         )
+        return continue
+      else
+        return true
       end
-
-      correct
     end
 
 

diff --git a/src/modules/IscsiClientLib.rb b/src/modules/IscsiClientLib.rb
@@ -568,7 +568,7 @@ def writeInitiatorName(new_value)
         Builtins.y2milestone("Initiatorname %1 written", @initiatorname)
       end
       # reload service when initiatorname is changed to re-read new value (bnc#482429)
-      # restart the daemon (reload not supported with systemd)
+      # SLES12: restart the daemon (reload not supported in iscsid.service)
       Service.Restart("iscsid")
       ret
     end