Skip to content

Commit

Permalink
add perl-Bootloader-YAML to needed packages (BNC#885496)
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Jul 3, 2014
1 parent 1e1bb2e commit d0c836f
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions src/modules/BootCommon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -865,26 +865,22 @@ def setLoaderType(bootloader)

# replace grub with trustedgrub
if Ops.get(@globals, "trusted_grub", "") == "true"
if Builtins.contains(bootloader_packages, "grub")
bootloader_packages = Builtins.filter(bootloader_packages) do |key|
key != "grub"
end
end

bootloader_packages = Builtins.add(bootloader_packages, "trustedgrub")
bootloader_packages.delete("grub")
bootloader_packages << "trustedgrub"
end

# we need perl-Bootloader-YAML API to communicate with pbl
bootloader_packages << "perl-Bootloader-YAML"

Builtins.y2milestone("Bootloader packages: %1", bootloader_packages)

# don't configure package manager during autoinstallation preparing
if Mode.normal && !(Mode.config || Mode.repair)
PackageSystem.InstallAll(bootloader_packages)
elsif Stage.initial
pkg_added = false
Builtins.foreach(bootloader_packages) do |p|
bootloader_packages.each do |p|
Builtins.y2milestone("Select bootloader package: %1", p)
PackagesProposal.AddResolvables("yast2-bootloader", :package, [p])
pkg_added = true
end
end
elsif !Mode.test
Expand Down

0 comments on commit d0c836f

Please sign in to comment.