do not mess bootloader in live installer, do not use obsolete and dro…

…pped modules
yast · Apr 13, 2016 · 200f6cc · 200f6cc
1 parent 6faceb8
commit 200f6cc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 33 deletions.
diff --git a/src/clients/inst_live_simple_proposal.rb b/src/clients/inst_live_simple_proposal.rb
@@ -26,7 +26,6 @@ class InstLiveSimpleProposalClient < Client
     def main
       Yast.import "UI"
 
-      Yast.import "BootCommon"
       Yast.import "GetInstArgs"
       Yast.import "Popup"
       Yast.import "Product"
@@ -130,37 +129,6 @@ def main
       end
 
       # end of partitioning summary
-      # bootloader summary
-
-      @timeout = Ops.get(BootCommon.globals, "timeout", "")
-
-      @other = false
-      Builtins.foreach(BootCommon.sections) do |s|
-        @other = true if Ops.get_string(s, "type", "") == "other"
-      end
-
-      @contents = Builtins.add(@contents, VSpacing(1))
-      @contents = Builtins.add(@contents, Left(Heading(_("System start-up"))))
-      @contents = Builtins.add(
-        @contents,
-        Left(
-          Label(
-            @other ?
-              _("Ask whether to boot Linux or existing system") :
-              _("Boot only Linux")
-          )
-        )
-      )
-      @contents = Builtins.add(
-        @contents,
-        Left(
-          Label(
-            Builtins.sformat(_("System start time-out: %1 seconds"), @timeout)
-          )
-        )
-      )
-
-      # end of bootloader summary
       # keyboard entry
 
       @contents = Builtins.add(@contents, VSpacing(1))

diff --git a/src/clients/live_copy_files_finish.rb b/src/clients/live_copy_files_finish.rb
@@ -45,7 +45,6 @@ def main
       Yast.import "FileUtils"
       Yast.import "String"
       Yast.import "Initrd"
-      Yast.import "BootStorage"
       # FIXME don't know why it fails :-(
       # import "SystemFilesCopy";