From 4bf7d88ab5d904078e8a574d7435e26ebbd96982 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 17 2022 08:45:11 +0000 Subject: import kdump-anaconda-addon-006-13.20220128git9603258.el9 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2b57c7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/kdump-anaconda-addon-9603258.tar.gz diff --git a/.kdump-anaconda-addon.metadata b/.kdump-anaconda-addon.metadata new file mode 100644 index 0000000..3637a74 --- /dev/null +++ b/.kdump-anaconda-addon.metadata @@ -0,0 +1 @@ +d0e113dcab835701658bd08d5702d463e51f0256 SOURCES/kdump-anaconda-addon-9603258.tar.gz diff --git a/SOURCES/0001.patch b/SOURCES/0001.patch new file mode 100644 index 0000000..772758b --- /dev/null +++ b/SOURCES/0001.patch @@ -0,0 +1,29 @@ +From aa335261b2c4771442d82ee1622f189603d4a43d Mon Sep 17 00:00:00 2001 +From: Kairui Song +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/initialization.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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"] + + 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/SOURCES/0002.patch b/SOURCES/0002.patch new file mode 100644 index 0000000..461abf3 --- /dev/null +++ b/SOURCES/0002.patch @@ -0,0 +1,60 @@ +From fd7b5edbb777d216ba9f94e5023f793fb01583cd Mon Sep 17 00:00:00 2001 +From: Kairui Song +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/kdump.py | 2 +- + com_redhat_kdump/service/kickstart.py | 2 +- + test/unit_tests/test_kickstart.py | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +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() + + 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/unit_tests/test_kickstart.py b/test/unit_tests/test_kickstart.py +index 49d73d2..f833504 100644 +--- a/test/unit_tests/test_kickstart.py ++++ b/test/unit_tests/test_kickstart.py +@@ -26,12 +26,12 @@ class KdumpKickstartTestCase(TestCase): + self.assertEqual(output.strip(), dedent(ks_out).strip()) + + def test_ks_default(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/SPECS/kdump-anaconda-addon.spec b/SPECS/kdump-anaconda-addon.spec new file mode 100644 index 0000000..e760369 --- /dev/null +++ b/SPECS/kdump-anaconda-addon.spec @@ -0,0 +1,118 @@ +%global gitcommit 960325885aa3b2b2b0af8343951ea86dcacec27a +%global gitshortcommit %(c=%{gitcommit}; echo ${c:0:7}) +%global snapshotdate 20220128 + +Name: kdump-anaconda-addon +Version: 006 +Release: 13.%{snapshotdate}git%{gitshortcommit}%{?dist} +Url: https://github.com/daveyoung/kdump-anaconda-addon +License: GPLv2 +Summary: Kdump configuration anaconda addon + +BuildArch: noarch +Requires: anaconda >= 34.25 +Requires: hicolor-icon-theme +BuildRequires: intltool gettext +BuildRequires: make +Obsoletes: kexec-tools-anaconda-addon < 2.0.17-9 +Provides: kexec-tools-anaconda-addon = %{version}-%{release} + +Source0: https://github.com/daveyoung/kdump-anaconda-addon/archive/%{gitcommit}/kdump-anaconda-addon-%{gitshortcommit}.tar.gz + +Patch1: 0001.patch +Patch2: 0002.patch + +%description +Kdump anaconda addon + +%prep +%autosetup -n %{name}-%{gitcommit} -p1 + +%build + +%install +%make_install + +%find_lang kdump-anaconda-addon + +%files -f kdump-anaconda-addon.lang +%doc README +%license LICENSE +%{_datadir}/anaconda/addons/com_redhat_kdump +%{_datadir}/anaconda/dbus/confs/org.fedoraproject.Anaconda.Addons.Kdump.conf +%{_datadir}/anaconda/dbus/services/org.fedoraproject.Anaconda.Addons.Kdump.service +%{_datadir}/icons/hicolor/scalable/apps/kdump.svg + +%changelog +* Thu Jan 20 2022 Coiby - 006-1.20220128git9603258 +- Update to latest git snapshot (20220128). Resolves: bz2046612 + +* Thu Jan 20 2022 Coiby - 006-1.20220120git44fe737 +- Update to latest git snapshot (20220120). Resolves: bz2003131 + +* Thu Jan 13 2022 Coiby - 006-1.20220113git4c5a91d +- Update to latest git snapshot (20220113). Resolves: bz2034491 + +* Thu Oct 14 2021 Kairui Song - 006-10.20211014git641a7b7 +- Update to latest git snapshot, update encryption warning message. Resolves: bz1999662 + +* Thu Aug 19 2021 Kairui Song - 006-9.20210819git2026d20 +- Update to latest git snapshot, fix encryption warning still present after disabling encryption. Resolves: bz1937035 + +* Wed Aug 18 2021 Kairui Song - 006-8.20210818git400359b +- Update to latest git snapshot, fix installation failure when reuse old partition. Resolves: bz1937035 + +* Thu Aug 12 2021 Kairui Song - 006-7.20210812git5b74c1d +- Update to latest git snapshot, fix kdump spoke is incomplete after luks device is deleted. Resolves: bz1937035 + +* Mon Aug 09 2021 Mohan Boddu - 006-6.20210805gitce26db0 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* 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 + +* Fri Apr 16 2021 Mohan Boddu - 006-3.20201128git4ba507e +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering - 006-2.20201128git4ba507e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Nov 28 2020 Kairui Song - 006-1.20201128git4ba507e +- Update to latest git snapshot (20201128) + +* Tue Jul 28 2020 Fedora Release Engineering - 005-9.20200220git80aab11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Feb 20 2020 Kairui Song - 005-8.20200220git80aab11 +- Update to latest git snapshot (20200220) + +* Tue Jan 14 2020 Kairui Song - 005-7.20200114git122ccd9 +- Update to latest git snapshot (20200114) + +* Wed Aug 7 2019 Kairui Song - 005-6.20190730gitc109552 +- Update to latest git snapshot (20190723) + +* Thu Jul 25 2019 Fedora Release Engineering - 005-5.20190103gitb16ea2c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 005-4.20190103gitb16ea2c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jan 3 2019 Kairui Song - 005-3.20190103gitb16ea2c +- Update to latest git snapshot (20190103) + +* Tue Aug 7 2018 Kairui Song - 005-2.20180730git966223e +- Bump obsoleted kexec-tools-anaconda-addon version +- Remove redundant source files + +* Tue Aug 7 2018 Kairui Song - 005-1.20180730git966223e +- Update to latest git snapshot (20180730) + +* Mon Jul 9 2018 Kairui Song - 005-1.20180626git8b243e3 +- Initial package for kdump-anaconda-addon