Merge pull request #64 from yast/sw_01

adjust zfcp "auto LUN scan" message (bsc#1068281, bsc#1104021)
yast · Apr 5, 2019 · 4cd6032 · 4cd6032
2 parents 2136cf1 + ba37ed2
commit 4cd6032
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/package/yast2-s390.changes b/package/yast2-s390.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  3 12:52:42 UTC 2019 - snwint@suse.com
+
+- adjust zfcp "auto LUN scan" message (bsc#1068281)
+- do not show "auto LUN scan" hint during auto install (bsc#1104021)
+- 4.1.1
+
 -------------------------------------------------------------------
 Tue Feb 26 12:57:12 UTC 2019 - José Iván López González <jlopez@suse.com>
 

diff --git a/package/yast2-s390.spec b/package/yast2-s390.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-s390
-Version:        4.1.0
+Version:        4.1.1
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/s390/zfcp/dialogs.rb b/src/include/s390/zfcp/dialogs.rb
@@ -311,7 +311,7 @@ def AddZFCPDiskDialog
             ComboBox(Id(:lun), Opt(:hstretch, :editable), _("&LUN"), luns)
           ),
           VSpacing(2),
-          Label(_("If no WWPN and no LUN have been defined the system is trying to use allow_lun_scan.")),
+          Label(_("If no WWPN and no LUN have been defined the system is trying to use auto LUN scan.")),
           VStretch()
         ),
         HStretch()

diff --git a/src/include/s390/zfcp/helps.rb b/src/include/s390/zfcp/helps.rb
@@ -84,7 +84,8 @@ def initialize_s390_zfcp_helps(_include_target)
               "<p>The LUN must be entered with lowercase letters as a 16-digit hex value with\n" \
               "all trailing zeros, such as <tt>0x52ca000000000000</tt>.</p>" \
               "<p>If no WWPN <b>and</b> no LUN have been defined the system is " \
-              "trying to use allow_lun_scan.</p>"
+              "trying to use auto LUN scan. Auto LUN scan can be turned off using " \
+              "the kernel parameter <tt>allow_lun_scan=0</tt>.</p>"
           ) +
           # Disk selection dialog Warning
           _("<h1>Warning</h1>") +

diff --git a/src/modules/ZFCPController.rb b/src/modules/ZFCPController.rb
@@ -557,13 +557,13 @@ def ReportControllerActivationError(channel, ret)
           )
         )
       when 10
-        Report.Message(
-          Builtins.sformat(
-            # message, %1 is device identification
-            _("%1: This host adapter supports allow_lun_scan."),
-            channel
-          )
+        msg = Builtins.sformat(
+          # message, %1 is device identification
+          _("%1: This host adapter supports auto LUN scan."),
+          channel
         )
+        # do not show this during auto install (bsc#1104021)
+        Mode.autoinst ? log.info(msg) : Report.Message(msg)
       else
         Report.Error(
           Builtins.sformat(