Package: makedumpfile
Version: 1:1.6.1-1
Severity: minor
Tags: patch

Hi,

The configuration file /etc/default/kdump-tools contains the setting
KDUMP_COREDIR twice. It also contains trailing spaces and tabs. Patches
to fix these are attached.

-- 
Benjamin Drung
System Developer
Debian & Ubuntu Developer

ProfitBricks GmbH
Greifswalder Str. 207
D - 10405 Berlin

Email: [email protected]
URL:  http://www.profitbricks.com

Sitz der Gesellschaft: Berlin.
Registergericht: Amtsgericht Charlottenburg, HRB 125506B.
Geschäftsführer: Andreas Gauger, Achim Weiss.
>From 249d01db839c4a9dd0e581e502eca87ba633f61d Mon Sep 17 00:00:00 2001
From: Benjamin Drung <[email protected]>
Date: Mon, 6 Mar 2017 13:27:38 +0100
Subject: [PATCH 1/3] kdump-tools.default: Remove trailing spaces

---
 debian/kdump-tools.default | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/kdump-tools.default b/debian/kdump-tools.default
index 0173d6d..036af0c 100644
--- a/debian/kdump-tools.default
+++ b/debian/kdump-tools.default
@@ -3,7 +3,7 @@
 # USE_KDUMP - controls kdump will be configured
 #     0 - kdump kernel will not be loaded
 #     1 - kdump kernel will be loaded and kdump is configured
-# KDUMP_SYSCTL - controls when a panic occurs, using the sysctl 
+# KDUMP_SYSCTL - controls when a panic occurs, using the sysctl
 #     interface.  The contents of this variable should be the
 #     "variable=value ..." portion of the 'sysctl -w ' command.
 #     If not set, the default value "kernel.panic_on_oops=1" will
@@ -20,7 +20,7 @@ USE_KDUMP=1
 # KDUMP_KERNEL - A full pathname to a kdump kernel.
 # KDUMP_INITRD - A full pathname to the kdump initrd (if used).
 #     If these are not set, kdump-config will try to use the current kernel
-#     and initrd if it is relocatable.  Otherwise, you will need to specify 
+#     and initrd if it is relocatable.  Otherwise, you will need to specify
 #     these manually.
 KDUMP_KERNEL=/var/lib/kdump/vmlinuz
 KDUMP_INITRD=/var/lib/kdump/initrd.img
@@ -61,12 +61,12 @@ KDUMP_COREDIR="/var/crash"
 # Kexec/Kdump args
 # KDUMP_KEXEC_ARGS - Additional arguments to the kexec command used to load
 #     the kdump kernel
-#     Example - Use this option on x86 systems with PAE and more than 
+#     Example - Use this option on x86 systems with PAE and more than
 #     4 gig of memory:
 #         KDUMP_KEXEC_ARGS="--elf64-core-headers"
-# KDUMP_CMDLINE - The default is to use the contents of /proc/cmdline.  
+# KDUMP_CMDLINE - The default is to use the contents of /proc/cmdline.
 #     Set this variable to override /proc/cmdline.
-# KDUMP_CMDLINE_APPEND - Additional arguments to append to the command line 
+# 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_KEXEC_ARGS=""
@@ -87,7 +87,7 @@ KDUMP_COREDIR="/var/crash"
 #           timestamped directory when sending files to the remote server.
 #           'ip' is the default.
 # NFS -     Hostname and mount point of the NFS server configured to receive
-#           the crash dump. The syntax must be {HOSTNAME}:{MOUNTPOINT} 
+#           the crash dump. The syntax must be {HOSTNAME}:{MOUNTPOINT}
 #           (e.g. remote:/var/crash)
 # NFS_TIMEO - Timeout before NFS retries a request. See man nfs(5) for details.
 # NFS_RETRANS - Number of times NFS client retries a request. See man nfs(5) for details.
@@ -96,7 +96,7 @@ KDUMP_COREDIR="/var/crash"
 # SSH_KEY="<path>"
 #
 # HOSTTAG="hostname|[ip]"
-# 
+#
 # NFS="<nfs mount>"
 #
 # NFS_TIMEO="600"
-- 
2.9.3

>From 79c9fb88ab7fca5570ca2665b14c18df6a606710 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <[email protected]>
Date: Mon, 6 Mar 2017 13:29:46 +0100
Subject: [PATCH 2/3] kdump-tools.default: Remove tabs by spaces

---
 debian/kdump-tools.default | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/kdump-tools.default b/debian/kdump-tools.default
index 036af0c..4a43c7b 100644
--- a/debian/kdump-tools.default
+++ b/debian/kdump-tools.default
@@ -79,10 +79,10 @@ KDUMP_COREDIR="/var/crash"
 # ---------------------------------------------------------------------------
 # Remote dump facilities:
 # SSH - username and hostname of the remote server that will receive the dump
-# 	and dmesg files.
+#       and dmesg files.
 # SSH_KEY - Full path of the ssh private key to be used to login to the remote
-# 	    server. use kdump-config propagate to send the public key to the
-# 	    remote server
+#           server. use kdump-config propagate to send the public key to the
+#           remote server
 # HOSTTAG - Select if hostname of IP address will be used as a prefix to the
 #           timestamped directory when sending files to the remote server.
 #           'ip' is the default.
-- 
2.9.3

>From 182444a3b634bd92638b5e7ce5d488b41050f736 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <[email protected]>
Date: Mon, 6 Mar 2017 13:30:58 +0100
Subject: [PATCH 3/3] kdump-tools.default: Remove duplicate settings

---
 debian/kdump-tools.default | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/kdump-tools.default b/debian/kdump-tools.default
index 4a43c7b..c4d2659 100644
--- a/debian/kdump-tools.default
+++ b/debian/kdump-tools.default
@@ -37,9 +37,6 @@ KDUMP_INITRD=/var/lib/kdump/initrd.img
 # KDUMP_DUMP_DMESG - This variable controls if the dmesg buffer is dumped.
 #     If unset or set to 1, the dmesg buffer is dumped. If set to 0, the dmesg
 #     buffer is not dumped.
-KDUMP_COREDIR="/var/crash"
-#KDUMP_FAIL_CMD="reboot -f"
-#KDUMP_DUMP_DMESG=
 # KDUMP_NUM_DUMPS - This variable controls how many dump files are kept on
 #     the machine to prevent running out of disk space. If set to 0 or unset,
 #     the variable is ignored and no dump files are automatically purged.
-- 
2.9.3

Reply via email to