Bug#985788: unblock: kdump-tools/1:1.6.8.3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package kdump-tools
[ Reason ]
It contains a single bug fix that fixes a regression which caused kdump-tools
to fail to collect kernel dump files in the common case (the files were
created, but just contained an error message).
[ Impact ]
Data loss - a kernel crash dump will fail to be collected and that
data will be gone after automated reboot.
[ Tests ]
A manual crash dump generation/validation.
[ Risks ]
The code fix is trivial.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
N/A
unblock kdump-tools/1:1.6.8.3
diff -Nru kdump-tools-1.6.8.2/debian/changelog kdump-tools-1.6.8.3/debian/changelog
--- kdump-tools-1.6.8.2/debian/changelog 2021-02-01 13:35:59.000000000 -0700
+++ kdump-tools-1.6.8.3/debian/changelog 2021-03-22 21:39:59.000000000 -0600
@@ -1,3 +1,10 @@
+kdump-tools (1:1.6.8.3) unstable; urgency=medium
+
+ * kdump-config: Fix storage of local/NFS dump files
+ (Closes: #985716) (LP: #1920759).
+
+ -- dann frazier <dannf@debian.org> Mon, 22 Mar 2021 21:39:59 -0600
+
kdump-tools (1:1.6.8.2) unstable; urgency=medium
* debian/control: Add Vcs-* tags.
diff -Nru kdump-tools-1.6.8.2/debian/kdump-config.in kdump-tools-1.6.8.3/debian/kdump-config.in
--- kdump-tools-1.6.8.2/debian/kdump-config.in 2021-02-01 13:35:59.000000000 -0700
+++ kdump-tools-1.6.8.3/debian/kdump-config.in 2021-03-22 21:39:59.000000000 -0600
@@ -53,7 +53,10 @@
NFS_RETRANS=${NFS_RETRANS:=3}
NFS_MOUNT_RETRY=${NFS_MOUNT_RETRY:=4}
SSH_KDUMP_RETRY=${SSH_KDUMP_RETRY:=16}
-MAKEDUMP_ARGS=${MAKEDUMP_ARGS:="-c -d 31"}
+MAKEDUMP_ARGS=${MAKEDUMP_ARGS:="-F -c -d 31"}
+# Add '-F' [flatten] to MAKEDUMP_ARGS, if not there:
+[ "${MAKEDUMP_ARGS#-F*}" != "${MAKEDUMP_ARGS}" ] || MAKEDUMP_ARGS="${MAKEDUMP_ARGS} -F"
+
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 ;
@@ -777,7 +780,7 @@
mkdir -p "$KDUMP_STAMPDIR"
fi
- log_action_msg "running makedumpfile $MAKEDUMP_ARGS $vmcore_file $KDUMP_CORETEMP"
+ log_action_msg "running makedumpfile $MAKEDUMP_ARGS $vmcore_file | compress > $KDUMP_CORETEMP"
# shellcheck disable=SC2086
makedumpfile $MAKEDUMP_ARGS $vmcore_file | compress > "$KDUMP_CORETEMP"
ERROR=$?
@@ -876,12 +879,9 @@
FTPPUT_ARGS="$FTPPUT_ARGS -P $FTP_PORT"
fi
- FTP_MAKEDUMP_ARGS="${MAKEDUMP_ARGS}"
- # Add '-F' [flatten] to FTP_MAKEDUMP_ARGS, if not there:
- [ "${FTP_MAKEDUMP_ARGS#-F*}" != "${FTP_MAKEDUMP_ARGS}" ] || FTP_MAKEDUMP_ARGS="${FTP_MAKEDUMP_ARGS} -F"
- log_action_msg "sending makedumpfile $FTP_MAKEDUMP_ARGS $vmcore_file via FTP to $FTP_REMOTE_HOST:$FTP_COREFILE"
+ log_action_msg "sending makedumpfile $MAKEDUMP_ARGS $vmcore_file via FTP to $FTP_REMOTE_HOST:$FTP_COREFILE"
# shellcheck disable=SC2086
- makedumpfile $FTP_MAKEDUMP_ARGS $vmcore_file | compress | busybox ftpput $FTPPUT_ARGS "$FTP_REMOTE_HOST" "$FTP_COREFILE" -
+ makedumpfile $MAKEDUMP_ARGS $vmcore_file | compress | busybox ftpput $FTPPUT_ARGS "$FTP_REMOTE_HOST" "$FTP_COREFILE" -
ERROR=$?
# did we succeed?
@@ -952,12 +952,9 @@
return 1
fi
- SSH_MAKEDUMP_ARGS="${MAKEDUMP_ARGS}"
- # Add '-F' [flatten] to MAKEDUMP_ARGS, if not there:
- [ "${SSH_MAKEDUMP_ARGS#-F*}" != "${SSH_MAKEDUMP_ARGS}" ] || SSH_MAKEDUMP_ARGS="${SSH_MAKEDUMP_ARGS} -F"
- log_action_msg "sending makedumpfile $SSH_MAKEDUMP_ARGS $vmcore_file to $SSH_REMOTE_HOST : $SSH_CORETEMP"
+ log_action_msg "sending makedumpfile $MAKEDUMP_ARGS $vmcore_file to $SSH_REMOTE_HOST : $SSH_CORETEMP"
# shellcheck disable=SC2086
- makedumpfile $SSH_MAKEDUMP_ARGS $vmcore_file | compress | ssh -i $SSH_KEY "$SSH_REMOTE_HOST" dd "of=$SSH_CORETEMP"
+ makedumpfile $MAKEDUMP_ARGS $vmcore_file | compress | ssh -i $SSH_KEY "$SSH_REMOTE_HOST" dd "of=$SSH_CORETEMP"
ERROR=$?
if [ $ERROR -ne 0 ] ; then
log_failure_msg "$NAME: makedumpfile failed, falling back to 'scp'"
Reply to: