Merge remote-tracking branch 'origin/master' into bsc1194453

yast · Jan 27, 2022 · 9aed776 · 9aed776
2 parents b70f393 + da2461a
commit 9aed776
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,9 +1,16 @@
 -------------------------------------------------------------------
-Wed Jan 26 20:19:41 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
+Thu Jan 27 07:50:21 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
 
 - Handle service name collision during upgrade (bsc#1194453),
   do not delete the new services which have the same name
   as an old service
+- 4.4.37
+
+-------------------------------------------------------------------
+Wed Jan 26 14:24:43 UTC 2022 - Knut Anderssen <kanderssen@suse.com>
+
+- Adjusted Linux Security Module configuration wording
+  (related to jsc#SLE-22069).
 - 4.4.36
 
 -------------------------------------------------------------------

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.4.36
+Version:        4.4.37
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

diff --git a/src/lib/installation/clients/security_proposal.rb b/src/lib/installation/clients/security_proposal.rb
@@ -257,16 +257,16 @@ def lsm_proposal
           # after the installation will be SELinux running in the selected mode which could be
           # 'enforcing', 'permissive' or 'disabled'
           format(_(
-                   "Linux Security Module: Activate %{module} in '%{mode}' mode"
+                   "Major Linux Security Module: Activate %{module} in '%{mode}' mode"
                  ), module: selected.label, mode: selected.mode.to_human_string)
         when :apparmor
           # TRANSLATORS: Proposal's text describing that the active Linux Security Major Module
           # after the installation will be AppArmor
-          format(_("Linux Security Module: Activate %{module}"), module: selected.label)
+          format(_("Major Linux Security Module: Activate %{module}"), module: selected.label)
         when :none
           # TRANSLATORS: Proposal's text describing that no Linux Security Major Module will be
           # activated after the installation
-          _("Linux Security Module: No major module will be activated")
+          _("Major Linux Security Module: No major module will be activated")
         end
       end
     end

diff --git a/src/lib/installation/dialogs/security.rb b/src/lib/installation/dialogs/security.rb
@@ -127,7 +127,7 @@ def cpu_frame
 
       def lsm_frame
         frame(
-          _("Linux Security Module"),
+          _("Major Linux Security Module"),
           Widgets::LSM.new(@settings)
         )
       end

diff --git a/src/lib/installation/widgets/lsm.rb b/src/lib/installation/widgets/lsm.rb
@@ -109,6 +109,7 @@ def initialize(settings)
 
       def init
         self.value = settings.selected&.id.to_s
+        disable if items.size <= 1
       end
 
       def opt
@@ -131,7 +132,7 @@ def store
       def help
         Yast::HTML.Para(
           # TRANSLATORS: Linux Security Module Selector help.
-          _("Allows to choose between available Linux Security major modules like:") +
+          _("Allows to choose between available major Linux Security Modules like:") +
           Yast::HTML.List(available_modules.map(&:label))
         )
       end

diff --git a/src/lib/installation/widgets/selinux_mode.rb b/src/lib/installation/widgets/selinux_mode.rb
@@ -32,8 +32,7 @@ def initialize(settings)
       end
 
       def label
-        # TRANSLATORS: SELinux Mode just SELinux is already content of frame.
-        _("Mode")
+        _("SELinux Mode")
       end
 
       def items
@@ -55,9 +54,9 @@ def help
           "<li><b>Enforcing</b> the state that enforces SELinux security policy. "\
           "Access is denied to users and programs unless permitted by " \
           "SELinux security policy rules. All denial messages are logged.</li> "\
-          "<b>Permissive</b> is a diagnostic state. The security policy rules are " \
+          "<li><b>Permissive</b> is a diagnostic state. The security policy rules are " \
           "not enforced, but SELinux sends denial messages to a log file.</li>" \
-          "<b>Disabled</b> SELinux does not enforce a security policy.</li></ul></p>"
+          "<li><b>Disabled</b> SELinux does not enforce a security policy.</li></ul></p>"
         )
       end
     end