Use templating to factor out the kdump kernel cmdline

The kdump cmdline is in 3 different places in the source. Let's
store the string in one place and generate the affected files.

This will also enable us to later use different cmdlines per-arch.

5 files changed, 22 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index b28dcb0..c31c0ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+makedumpfile (1:1.6.2-2) UNRELEASED; urgency=medium
+
+  * Make the kdump kernel cmdline consistent in comments, code & docs.
+
+ -- dann frazier <dannf@debian.org>  Fri, 05 Jan 2018 09:41:07 -0700
+
 makedumpfile (1:1.6.2-1) unstable; urgency=medium
 
   [ Thadeu Lima de Souza Cascardo ]
diff --git a/debian/kdump-config b/debian/kdump-config.in
index ba79bc8..b93d8bb 100755
--- a/debian/kdump-config
+++ b/debian/kdump-config.in
@@ -51,7 +51,7 @@ KDUMP_NUM_DUMPS=${KDUMP_NUM_DUMPS:=0}
 NFS_TIMEO=${NFS_TIMEO:=600}
 NFS_RETRANS=${NFS_RETRANS:=3}
 MAKEDUMP_ARGS=${MAKEDUMP_ARGS:="-c -d 31"}
-KDUMP_CMDLINE_APPEND=${KDUMP_CMDLINE_APPEND:="irqpoll nr_cpus=1 nousb systemd.unit=kdump-tools.service ata_piix.prefer_ms_hyperv=0"}
+KDUMP_CMDLINE_APPEND=${KDUMP_CMDLINE_APPEND:="@KDUMP_CMDLINE_APPEND@"}
 KDUMP_KERNEL_HOOK="/etc/kernel/postinst.d/kdump-tools"
 [ -d $KDUMP_COREDIR ] || mkdir -p $KDUMP_COREDIR ;
 
diff --git a/debian/kdump-tools.5 b/debian/kdump-tools.5.in
index 01eb7d7..7cadc6f 100644
--- a/debian/kdump-tools.5
+++ b/debian/kdump-tools.5.in
@@ -125,7 +125,7 @@ Set this variable to override
 .B KDUMP_CMDLINE_APPEND
 Additional arguments to append to the command line for the kdump kernel.  
 If not set,  
-.RI \*(lq "irqpoll nr_cpus=1 nousb" \*(rq
+.RI \*(lq "@KDUMP_CMDLINE_APPEND@" \*(rq
 will be used.
 .TP
 .B SSH
diff --git a/debian/kdump-tools.conf b/debian/kdump-tools.conf.in
index 0173d6d..97cccb4 100644
--- a/debian/kdump-tools.conf
+++ b/debian/kdump-tools.conf.in
@@ -68,10 +68,10 @@ KDUMP_COREDIR="/var/crash"
 #     Set this variable to override /proc/cmdline.
 # KDUMP_CMDLINE_APPEND - Additional arguments to append to the command line 
 #     for the kdump kernel.  If unset, it defaults to
-#     "irqpoll nr_cpus=1 nousb systemd.unit=kdump-tools.service ata_piix.prefer_ms_hyperv=0"
+#     "@KDUMP_CMDLINE_APPEND@"
 #KDUMP_KEXEC_ARGS=""
 #KDUMP_CMDLINE=""
-#KDUMP_CMDLINE_APPEND="irqpoll nr_cpus=1 nousb systemd.unit=kdump-tools.service ata_piix.prefer_ms_hyperv=0"
+#KDUMP_CMDLINE_APPEND="@KDUMP_CMDLINE_APPEND@"
 
 # ---------------------------------------------------------------------------
 # Architecture specific Overrides:
diff --git a/debian/rules b/debian/rules
index eec109e..77ed939 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,8 @@ else
 	SUBSTVARS = -Vdist:Depends="kexec-tools"
 endif
 
+KDUMP_CMDLINE_APPEND = irqpoll nr_cpus=1 nousb systemd.unit=kdump-tools.service ata_piix.prefer_ms_hyperv=0
+
 %:
 	dh $@ --with=systemd
 
@@ -16,7 +18,15 @@ override_dh_gencontrol:
 override_dh_auto_build:
 	dh_auto_build -- LINKTYPE=dynamic USELZO=on
 
-override_dh_install:
+kdump_cmdline_insert = sed "s/@KDUMP_CMDLINE_APPEND@/$(KDUMP_CMDLINE_APPEND)/" < $< > $@
+debian/kdump-config: debian/kdump-config.in
+	$(kdump_cmdline_insert)
+debian/kdump-tools.conf: debian/kdump-tools.conf.in
+	$(kdump_cmdline_insert)
+debian/kdump-tools.5: debian/kdump-tools.5.in
+	$(kdump_cmdline_insert)
+
+override_dh_install: debian/kdump-config debian/kdump-tools.conf debian/kdump-tools.5
 	dh_install
 	install -D -m 755 debian/kernel-postinst-generate-initrd debian/kdump-tools/etc/kernel/postinst.d/kdump-tools
 	install -D -m 755 debian/kernel-postrm-delete-initrd debian/kdump-tools/etc/kernel/postrm.d/kdump-tools
@@ -37,4 +47,5 @@ override_dh_installdeb:
 
 override_dh_auto_clean:
 	rm -f debian/kdump-tools.maintscript
+	rm -f debian/kdump-config debian/kdump-tools.conf debian/kdump-tools.5
 	dh_auto_clean