Removed checks for Architecture from code relying on the new class.

yast · Feb 29, 2016 · 68b3d8e · 68b3d8e
1 parent abfabb4
commit 68b3d8e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/include/security/helps.rb b/src/include/security/helps.rb
@@ -340,13 +340,13 @@ def boot_dialog_help
         "<p><b><big>Boot Security</big></b></p>\n<p>In this dialog, change various boot settings related to security.</p>"
       )
 
-      # Boot dialog help 2/4, not shown for s390 architecture
-      if Arch.s390
+      # Boot dialog help 2/4, diferent message based on default
+      if ::Security::CtrlAltDelConfig.default == "reboot"
         help += _(
           "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n" +
             "Configure what the system should do in response to\n" +
             "someone at the console pressing the CTRL + ALT + DEL key\n" +
-            "combination. By default the system halts but sometimes it is desirable\n" +
+            "combination. Usually the system reboots. Sometimes it is desirable\n" +
             "to ignore this event, for example, when the system serves as both\n" +
             "workstation and server.</p>"
         )
@@ -355,11 +355,12 @@ def boot_dialog_help
           "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n" +
             "Configure what the system should do in response to\n" +
             "someone at the console pressing the CTRL + ALT + DEL key\n" +
-            "combination. Usually the system reboots. Sometimes it is desirable\n" +
+            "combination. By default the system halts but sometimes it is desirable\n" +
             "to ignore this event, for example, when the system serves as both\n" +
             "workstation and server.</p>"
         )
       end
+
       # Boot dialog help 3/4
       help += _(
           "<p><b>Shutdown Behaviour of Login Manager</b>:\nSet who is allowed to shut down the machine from KDM.</p>\n"

diff --git a/src/include/security/widgets.rb b/src/include/security/widgets.rb
@@ -101,7 +101,7 @@ def initialize_security_widgets(include_target)
               "&Interpretation of Ctrl + Alt + Del"
             ),
             "Options" => console_shutdown_options,
-            "Value"   => Arch.s390 ? "halt" : "reboot"
+            "Value"   => ::Security::CtrlAltDelConfig.default
           },
           "DISPLAYMANAGER_REMOTE_ACCESS" => {
             "Widget" => "CheckBox",