Merge remote-tracking branch 'upstream/SLE-15-SP6' into SLE-15-SP7

yast · Sep 17, 2024 · f8a2cd7 · f8a2cd7
2 parents 4550e67 + aff6129
commit f8a2cd7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/package/yast2-kdump.changes b/package/yast2-kdump.changes
@@ -1,7 +1,14 @@
+-------------------------------------------------------------------
+Tue Sep 17 14:24:44 UTC 2024 - Stefan Hundhammer <[email protected]>
+
+- Don't write empty  fadump=""  kernel parameter (bsc#1230359)
+- 4.7.1
+
 -------------------------------------------------------------------
 Fri Sep 06 07:14:32 UTC 2024 - Ladislav Slezák <[email protected]>
 
 - Branch package for SP7 (bsc#1230201)
+- 4.7.0
 
 -------------------------------------------------------------------
 Mon Nov 13 15:35:53 UTC 2023 - Josef Reidinger <[email protected]>

diff --git a/package/yast2-kdump.spec b/package/yast2-kdump.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-kdump
-Version:        4.7.0
+Version:        4.7.1
 Release:        0
 Summary:        Configuration of kdump
 License:        GPL-2.0-only

diff --git a/src/modules/Kdump.rb b/src/modules/Kdump.rb
@@ -1223,6 +1223,7 @@ def write_fadump_boot_param
       if fadump_supported?
         # If fdump is selected and we want to enable kdump
         value = "on" if using_fadump? && @add_crashkernel_param
+        value ||= :missing
         Bootloader.modify_kernel_params(:common, :recovery, "fadump" => value)
         Bootloader.Write unless Yast::Stage.initial # do mass write in installation to speed up
       end