diff --git a/.gitignore b/.gitignore index c5e27b6..892a03b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /kdump-anaconda-addon-80aab11.tar.gz /kdump-anaconda-addon-4ba507e.tar.gz /kdump-anaconda-addon-d046d22.tar.gz +/kdump-anaconda-addon-ce26db0.tar.gz diff --git a/0001.patch b/0001.patch index aeb51d3..772758b 100644 --- a/0001.patch +++ b/0001.patch @@ -1,26 +1,29 @@ -From 6bb1782569693efb637cb166e307e2e4cd5ee6fd Mon Sep 17 00:00:00 2001 +From aa335261b2c4771442d82ee1622f189603d4a43d Mon Sep 17 00:00:00 2001 From: Kairui Song -Date: Wed, 21 Jul 2021 02:06:36 +0800 -Subject: [PATCH 1/2] Enable kdump by default +Date: Wed, 2 Jun 2021 16:44:08 +0800 +Subject: [PATCH 1/2] Make kdump options visible by default + +Currently this addon is completely hidden unless kdump_addon=on +is set, make it visible by default. Kdump is still disabled by default, +just show the kdump tab. Signed-off-by: Kairui Song --- - com_redhat_kdump/service/kdump.py | 2 +- + com_redhat_kdump/service/initialization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/com_redhat_kdump/service/kdump.py b/com_redhat_kdump/service/kdump.py -index 46e7242..4f4cdd1 100755 ---- a/com_redhat_kdump/service/kdump.py -+++ b/com_redhat_kdump/service/kdump.py -@@ -41,7 +41,7 @@ class KdumpService(KickstartService): - def __init__(self): - """Create a service.""" - super().__init__() -- self._kdump_enabled = False -+ self._kdump_enabled = True - self.kdump_enabled_changed = Signal() +diff --git a/com_redhat_kdump/service/initialization.py b/com_redhat_kdump/service/initialization.py +index 2bdbe6e..0e247df 100644 +--- a/com_redhat_kdump/service/initialization.py ++++ b/com_redhat_kdump/service/initialization.py +@@ -27,6 +27,6 @@ __all__ = ["check_initial_conditions"] - self._fadump_enabled = False + def check_initial_conditions(): + """Can the Kdump service run?""" +- if not kernel_arguments.is_enabled("kdump_addon"): ++ if kernel_arguments.get("kdump_addon", 1) in ["0", "off", False]: + log.debug("The kdump add-on is disabled. Quit.") + sys.exit(1) -- 2.31.1 diff --git a/0002.patch b/0002.patch index 1b62a14..4e87113 100644 --- a/0002.patch +++ b/0002.patch @@ -1,29 +1,60 @@ -From 5dbcac32ba9c5d5c3cdfc8ea303f81e9af4f728a Mon Sep 17 00:00:00 2001 +From fd7b5edbb777d216ba9f94e5023f793fb01583cd Mon Sep 17 00:00:00 2001 From: Kairui Song -Date: Wed, 2 Jun 2021 16:44:08 +0800 -Subject: [PATCH 2/2] Make kdump options visible by default - -Currently this addon is completely hidden unless kdump_addon=on -is set, make it visible by default. Kdump is still disabled by default, -just show the kdump tab. +Date: Wed, 21 Jul 2021 02:06:36 +0800 +Subject: [PATCH 2/2] Enable kdump by default Signed-off-by: Kairui Song --- - com_redhat_kdump/service/initialization.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + com_redhat_kdump/service/kdump.py | 2 +- + com_redhat_kdump/service/kickstart.py | 2 +- + test/unittests/test_kickstart.py | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/com_redhat_kdump/service/initialization.py b/com_redhat_kdump/service/initialization.py -index 2bdbe6e..998fca6 100644 ---- a/com_redhat_kdump/service/initialization.py -+++ b/com_redhat_kdump/service/initialization.py -@@ -27,6 +27,6 @@ __all__ = ["check_initial_conditions"] +diff --git a/com_redhat_kdump/service/kdump.py b/com_redhat_kdump/service/kdump.py +index 46e7242..4f4cdd1 100755 +--- a/com_redhat_kdump/service/kdump.py ++++ b/com_redhat_kdump/service/kdump.py +@@ -41,7 +41,7 @@ class KdumpService(KickstartService): + def __init__(self): + """Create a service.""" + super().__init__() +- self._kdump_enabled = False ++ self._kdump_enabled = True + self.kdump_enabled_changed = Signal() - def check_initial_conditions(): - """Can the Kdump service run?""" -- if not kernel_arguments.is_enabled("kdump_addon"): -+ if not kernel_arguments.get("kdump_addon", 1): - log.debug("The kdump add-on is disabled. Quit.") - sys.exit(1) + self._fadump_enabled = False +diff --git a/com_redhat_kdump/service/kickstart.py b/com_redhat_kdump/service/kickstart.py +index c2455a4..32c532f 100644 +--- a/com_redhat_kdump/service/kickstart.py ++++ b/com_redhat_kdump/service/kickstart.py +@@ -36,7 +36,7 @@ class KdumpKickstartData(AddonData): + + def __init__(self): + super().__init__() +- self.enabled = False ++ self.enabled = True + self.reserve_mb = "auto" + self.enablefadump = False + +diff --git a/test/unittests/test_kickstart.py b/test/unittests/test_kickstart.py +index 49d73d2..f833504 100644 +--- a/test/unittests/test_kickstart.py ++++ b/test/unittests/test_kickstart.py +@@ -26,12 +26,12 @@ class KdumpKickstartTestCase(TestCase): + self.assertEqual(output.strip(), dedent(ks_out).strip()) + + def ks_default_test(self): +- self.assertEqual(self._service.kdump_enabled, False) ++ self.assertEqual(self._service.kdump_enabled, True) + self.assertEqual(self._service.fadump_enabled, False) + self.assertEqual(self._service.reserved_memory, "auto") + + self._check_ks_output(""" +- %addon com_redhat_kdump --disable ++ %addon com_redhat_kdump --enable --reserve-mb='auto' + + %end + """) -- 2.31.1 diff --git a/kdump-anaconda-addon.spec b/kdump-anaconda-addon.spec index 0ae9f67..dd285c1 100644 --- a/kdump-anaconda-addon.spec +++ b/kdump-anaconda-addon.spec @@ -1,10 +1,10 @@ -%global gitcommit d046d22af07c2613417ce31c27952f771c12922b +%global gitcommit ce26db06e0cf3606317363480b3e325633c99714 %global gitshortcommit %(c=%{gitcommit}; echo ${c:0:7}) -%global snapshotdate 20210721 +%global snapshotdate 20210805 Name: kdump-anaconda-addon Version: 006 -Release: 4.%{snapshotdate}git%{gitshortcommit}%{?dist} +Release: 5.%{snapshotdate}git%{gitshortcommit}%{?dist} Url: https://github.com/daveyoung/kdump-anaconda-addon License: GPLv2 Summary: Kdump configuration anaconda addon @@ -44,6 +44,10 @@ Kdump anaconda addon %{_datadir}/icons/hicolor/scalable/apps/kdump.svg %changelog +* Thu Aug 05 2021 Kairui Song - 006-5.20210805gitce26db0 +- Update to latest git snapshot, automated installation won't be blocked. Resolves: bz1986969 +- Update RHEL only patch, fix inst.kdump_addon=0 not working issue. Resolves: bz1986942 + * Wed Jul 21 2021 Kairui Song - 006-4.20210721gitd046d22 - Update to latest git snapshot (20210721). Resolves: bz1937035, bz1959203 - Apply RHEL only patch to enable kdump by default diff --git a/sources b/sources index d4e9a3c..553c9db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdump-anaconda-addon-d046d22.tar.gz) = 636d758c8e9d5069b19c43480c638ec85d416b6b96329d79b290e7d5c41e91b3275baba38291854bae61d3eaca0f85a803d3d408b4f0de315aab4256392c99ba +SHA512 (kdump-anaconda-addon-ce26db0.tar.gz) = b76fa7189ad695de410c04ded101516e72fea828b91b54fe82cb06ffc4f14502a335c1fc6a783a128f98bb95225051e040ded2d4599b7413778d74cfca4ee73f