Skip to content

Commit

Permalink
Merge d84aa77 into 793b336
Browse files Browse the repository at this point in the history
  • Loading branch information
@jreidinger
jreidinger committed Apr 23, 2018
2 parents 793b336 + d84aa77 commit 6a203a3
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 17 deletions.
6 changes: 6 additions & 0 deletions package/yast2-kdump.changes
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 19 22:55:41 UTC 2018 - jreidinger@suse.com

- do not write crashkernel to XEN dom0 (bsc#1085626)
- 4.0.3

-------------------------------------------------------------------
Thu Apr 19 16:25:07 CEST 2018 - snwint@suse.de

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-kdump.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-kdump
Version: 4.0.2
Version: 4.0.3
Release: 0
Summary: Configuration of kdump
License: GPL-2.0
Expand Down
5 changes: 2 additions & 3 deletions src/modules/Kdump.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ def checkPassword
# @return [Boolean] successfull
def ReadKdumpKernelParam
result = Bootloader.kernel_param(:common, "crashkernel")
result = Bootloader.kernel_param(:xen_guest, "crashkernel") if result == :missing
xen_result = Bootloader.kernel_param(:xen_host, "crashkernel")
# result could be [String,Array,:missing,:present]
# String - the value of the only occurrence
Expand Down Expand Up @@ -496,7 +495,7 @@ def WriteKdumpBootParameter
Service.Enable(KDUMP_SERVICE_NAME)
Service.Restart(KDUMP_SERVICE_NAME) if Service.active?(KDUMP_SERVICE_NAME)
else
Bootloader.modify_kernel_params(:common, :xen_guest, :recovery, "crashkernel" => crash_values)
Bootloader.modify_kernel_params(:common, :recovery, "crashkernel" => crash_values)
Bootloader.modify_kernel_params(:xen_host, "crashkernel" => crash_xen_values)
# do mass write in installation to speed up, so skip this one
if !Stage.initial
Expand Down Expand Up @@ -1220,7 +1219,7 @@ def write_fadump_boot_param
else
value = nil
end
Bootloader.modify_kernel_params(:common, :xen_guest, :recovery, "fadump" => value)
Bootloader.modify_kernel_params(:common, :recovery, "fadump" => value)
Bootloader.Write unless Yast::Stage.initial # do mass write in installation to speed up
end
end
Expand Down
26 changes: 13 additions & 13 deletions test/kdump_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
it "writes the crashkernel value to the bootloader and enables the service" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => ["the_value"])
.with(:common, :recovery, "crashkernel" => ["the_value"])
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => ["xen_value"])
Expand All @@ -464,7 +464,7 @@
it "writes an empty crashkernel in the bootloader and enables the service" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => [])
.with(:common, :recovery, "crashkernel" => [])
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => [])
Expand All @@ -481,7 +481,7 @@
it "writes a proposed crashkernel in the bootloader and enables the service" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => bootlader_kernel_params)
.with(:common, :recovery, "crashkernel" => bootlader_kernel_params)
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => bootlader_xen_kernel_params)
Expand Down Expand Up @@ -512,7 +512,7 @@
it "writes the crashkernel value without removing the offset" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => ["72M@128"])
.with(:common, :recovery, "crashkernel" => ["72M@128"])
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => ["72M@128"])
Expand Down Expand Up @@ -541,7 +541,7 @@
it "writes the crashkernel value to the bootloader and enables the service" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => ["the_value"])
.with(:common, :recovery, "crashkernel" => ["the_value"])
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => ["xen_value"])
Expand All @@ -558,7 +558,7 @@
it "writes an empty crashkernel in the bootloader and enables the service" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => [])
.with(:common, :recovery, "crashkernel" => [])
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => [])
Expand All @@ -575,7 +575,7 @@
it "rewrites the bootloader crashkernel settings and enables the service" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => bootlader_kernel_params)
.with(:common, :recovery, "crashkernel" => bootlader_kernel_params)
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => bootlader_xen_kernel_params)
Expand Down Expand Up @@ -606,7 +606,7 @@
it "writes the crashkernel value without removing the offset" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => ["72M@128"])
.with(:common, :recovery, "crashkernel" => ["72M@128"])
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => ["72M@128"])
Expand Down Expand Up @@ -634,7 +634,7 @@
it "updates crashkernel and enables service if crashkernel is changed" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => ["128M"])
.with(:common, :recovery, "crashkernel" => ["128M"])
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => ["128M\\<4G"])
Expand Down Expand Up @@ -675,7 +675,7 @@
it "writes chrashkernel and enables the service if kdump was enabled" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, "crashkernel" => ["64M"])
.with(:common, :recovery, "crashkernel" => ["64M"])
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => ["64M\\<4G"])
Expand Down Expand Up @@ -712,7 +712,7 @@
it "removes the range" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, {"crashkernel" => ["64M"]})
.with(:common, :recovery, {"crashkernel" => ["64M"]})
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => ["64M\\<4G"])
Expand Down Expand Up @@ -749,7 +749,7 @@
it "removes the offset" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, {"crashkernel" => ["64M"]})
.with(:common, :recovery, {"crashkernel" => ["64M"]})
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, "crashkernel" => ["64M\\<4G"])
Expand All @@ -763,7 +763,7 @@
it "removes the offset" do
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:common, :xen_guest, :recovery, {"crashkernel" => ["-512M:64M,512M-:128M"]})
.with(:common, :recovery, {"crashkernel" => ["-512M:64M,512M-:128M"]})
expect(Yast::Bootloader)
.to receive(:modify_kernel_params)
.with(:xen_host, {"crashkernel" => ["-512M:64M,512M-:128M"]})
Expand Down
1 change: 1 addition & 0 deletions test/test_helper.rb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
srcdir = File.expand_path("../../src", __FILE__)
y2dirs = ENV.fetch("Y2DIR", "").split(":")
ENV["Y2DIR"] = y2dirs.unshift(srcdir).join(":")
ENV["LC_ALL"] = "en_US.utf-8"

require "yast"
require "yast/rspec"
Expand Down

0 comments on commit 6a203a3

Please sign in to comment.