remove widgets for trusted grub which is also dropped for grub2

yast · Sep 3, 2014 · 1eea299 · 1eea299
1 parent 1329c6a
commit 1eea299
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 40 deletions.
diff --git a/src/include/bootloader/grub/helps.rb b/src/include/bootloader/grub/helps.rb
@@ -44,9 +44,6 @@ def initialize_bootloader_grub_helps(include_target)
         "boot_boot"               => _(
           "<p><b>Boot from Boot Partition</b> is one of the recommended options, the other is\n<b>Boot from Root Partition</b>.</p>"
         ),
-        "trusted_grub"            => _(
-          "<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\nIt is recommended to install grub to MBR</p>"
-        ),
         "boot_mbr"                => _(
           "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\ninstalled on your computer</p>"
         ),
@@ -106,7 +103,6 @@ def initialize_bootloader_grub_helps(include_target)
         "timeout"       => _("&Timeout in Seconds"),
         "default"       => _("&Default Boot Section"),
         "generic_mbr"   => _("Write &generic Boot Code to MBR"),
-        "trusted_grub"  => _("Use &Trusted Grub"),
         "boot_custom"   => _("Custom Boot Partition"),
         "boot_mbr"      => _("Boot from Master Boot Record"),
         "boot_root"     => _("Boot from Root Partition"),

diff --git a/src/include/bootloader/grub/options.rb b/src/include/bootloader/grub/options.rb
@@ -32,26 +32,6 @@ def initialize_bootloader_grub_options(include_target)
       Yast.include include_target, "bootloader/grub/helps.rb"
     end
 
-    def HandleTrusted(widget, event)
-      event = deep_copy(event)
-      value = Convert.to_boolean(UI.QueryWidget(Id(widget), :Value))
-      nil
-    end
-
-    def TrustedWidget
-      widget = CommonCheckboxWidget(
-        Ops.get(@grub_descriptions, "trusted_grub", "trusted grub"),
-        Ops.get(@grub_help_messages, "trusted_grub", "")
-      )
-      Ops.set(widget, "opt", [:notify])
-      Ops.set(
-        widget,
-        "handle",
-        fun_ref(method(:HandleTrusted), "symbol (string, map)")
-      )
-      deep_copy(widget)
-    end
-
     # Init function of widget
     # @param [String] widget string id of the widget
     def InitPasswdWidget(widget)
@@ -288,7 +268,6 @@ def GrubOptions
           Ops.get(@grub_descriptions, "generic_mbr", "generic mbr"),
           Ops.get(@grub_help_messages, "generic_mbr", "")
         ),
-        "trusted_grub"     => TrustedWidget(),
         "hiddenmenu"       => CommonCheckboxWidget(
           Ops.get(@grub_descriptions, "hiddenmenu", "hidden menu"),
           Ops.get(@grub_help_messages, "hiddenmenu", "")

diff --git a/src/include/bootloader/routines/global_widgets.rb b/src/include/bootloader/routines/global_widgets.rb
@@ -317,21 +317,6 @@ def LoaderTypeValidate(widget, event)
     # @param [String] widget string widget key
     # @param [Hash] event map event that caused the operation
     def LoaderTypeStore(widget, event)
-      event = deep_copy(event)
-      ret = false
-      if Ops.get(BootCommon.globals, "trusted_grub", "") == "true"
-        if !Package.Installed("trustedgrub") && Mode.normal
-          if !PackageSystem.CheckAndInstallPackages(["trustedgrub"])
-            if !Mode.commandline
-              Popup.Error(Message.CannotContinueWithoutPackagesInstalled)
-            end
-            Builtins.y2error(
-              "Installation of package trustedgrub failed or aborted"
-            )
-          end
-        end
-      end
-
       nil
     end