Removed also Arch.s390 dependencies from options.

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

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/include/security/widgets.rb b/src/include/security/widgets.rb
@@ -263,18 +263,20 @@ def initialize_security_widgets(include_target)
         }
     end
 
-    def console_shutdown_options
-      # ComboBox value
-      options = [["ignore", _("Ignore")]]
-
-      # ComboBox value, not shown in s390 architecture
-      options << ["reboot", _("Reboot")] if !Arch.s390
-
-      # ComboBox value
-      options << ["halt", _("Halt")]
+    def boot_option_labels
+      {
+        "ignore" => _("Ignore"),
+        "reboot" => _("Reboot"),
+        "halt"   => _("Halt")
+      }
+    end
 
-      options
-      # EOF
+    def console_shutdown_options
+      ::Security::CtrlAltDelConfig.options.map do |opt|
+        [opt, boot_option_labels[opt]]
+      end
     end
+
+    # EOF
   end
 end
diff --git a/src/lib/security/ctrl_alt_del_config.rb b/src/lib/security/ctrl_alt_del_config.rb
@@ -44,6 +44,14 @@ def default
         Yast::Arch.s390 ? "halt" : "reboot"
       end
 
+      def options
+        options = ["ignore", "reboot", "halt"]
+
+        options.delete("reboot") if Yast::Arch.s390
+
+        options
+      end
+
       def current
         return current_systemd if systemd?
         return current_inittab if inittab?