8:58 a.m.
Signed-off-by: Philipp Rudo <prudo(a)redhat.com>
---
.gitignore | 2 ++
kdump-gen-configs.sh | 10 +++++++---
kdump.conf => kdump.conf.template | 0
kexec-tools.spec | 6 +++---
4 files changed, 12 insertions(+), 6 deletions(-)
rename kdump.conf => kdump.conf.template (100%)
diff --git a/.gitignore b/.gitignore
index e9c2dd8..0c1c145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,6 @@
/kexec-tools-2.0.11.tar.xz
/makedumpfile-1.5.9.tar.gz
/kexec-tools-2.0.12.tar.xz
+kdump.sysconfig
+kdump.conf
coverage/
diff --git a/kdump-gen-configs.sh b/kdump-gen-configs.sh
index 3a79977..ed8647c 100755
--- a/kdump-gen-configs.sh
+++ b/kdump-gen-configs.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-TEMPLATE=$1
-ARCH=$2
+ARCH=$1; shift
SED_EXP=""
param_set()
@@ -53,6 +52,9 @@ s390x)
param_del KDUMP_COMMANDLINE_APPEND "irqpoll"
param_del KDUMP_COMMANDLINE_APPEND "reset_devices"
param_add KDUMP_COMMANDLINE_APPEND "vmcp_cma=0"
+
+ param_del core_collector "-l"
+ param_add core_collector "-c"
;;
x86_64)
param_add KDUMP_COMMANDLINE_APPEND "mce=off acpi_no_memhotplug nokaslr
hest_disable"
@@ -66,4 +68,6 @@ esac
# well as the ones at the beginning and end of a quote
SED_EXP="${SED_EXP}/^#/!{s/^\s\+//g;s/\s\+$//g;s/\s\+/
/g;s/\"\s\+/\"/g;s/\s\+\"/\"/g};"
-sed "$SED_EXP" "$TEMPLATE"
+for TEMPLATE in "$@"; do
+ sed "$SED_EXP" "$TEMPLATE" > ${TEMPLATE%%.template}
+done
diff --git a/kdump.conf b/kdump.conf.template
similarity index 100%
rename from kdump.conf
rename to kdump.conf.template
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 462a7a1..4087bec 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -14,7 +14,7 @@ Source1: kdumpctl
Source2: kdump.sysconfig.template
Source3: kdump-gen-sysconfig.sh
Source7: mkdumprd
-Source8: kdump.conf
+Source8: kdump.conf.template
Source9:
https://github.com/makedumpfile/makedumpfile/archive/%{mkdf_ver}/makedump...
Source10: kexec-kdump-howto.txt
Source11: fadump-howto.txt
@@ -148,7 +148,7 @@ cp %{SOURCE27} .
cp %{SOURCE34} .
# Generate sysconfig file
-%{SOURCE3} %{SOURCE2} %{_target_cpu} > kdump.sysconfig
+%{SOURCE3} %{_target_cpu} %{SOURCE2} %{SOURCE8}
make
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
@@ -182,7 +182,7 @@ install -m 644 build/man/man8/kexec.8
$RPM_BUILD_ROOT%{_mandir}/man8/
install -m 644 build/man/man8/vmcore-dmesg.8 $RPM_BUILD_ROOT%{_mandir}/man8/
install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/sbin/mkdumprd
-install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
+install -m 644 kdump.conf $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
install -m 644 kdump.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8
--
2.35.1