diff -pruN 1:1.8.1/debian/changelog 1:1.8.1ubuntu1/debian/changelog --- 1:1.8.1/debian/changelog 2023-01-01 17:53:45.000000000 +0000 +++ 1:1.8.1ubuntu1/debian/changelog 2023-01-02 18:09:03.000000000 +0000 @@ -1,3 +1,16 @@ +kdump-tools (1:1.8.1ubuntu1) lunar; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + - Update default s390x crashkernel. + - Install the updated zipl.conf with ucf, so users will be able to + decide whether to pick any crashkernel changes. + + -- dann frazier Mon, 02 Jan 2023 11:09:03 -0700 + kdump-tools (1:1.8.1) unstable; urgency=medium * kdump-config: Add double quotes to address shellcheck SC2086, @@ -7,6 +20,26 @@ kdump-tools (1:1.8.1) unstable; urgency= -- dann frazier Sun, 01 Jan 2023 10:53:45 -0700 +kdump-tools (1:1.8ubuntu2) lunar; urgency=medium + + * Modifed ucf call in d/kdump-tools.postinst to use option + '--debconf-ok' to fix a package install issue (LP: #1982582). + + -- Frank Heimes Wed, 23 Nov 2022 19:40:57 +0100 + +kdump-tools (1:1.8ubuntu1) kinetic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + - Update default s390x crashkernel. + - Install the updated zipl.conf with ucf, so users will be able to + decide whether to pick any crashkernel changes. + + -- dann frazier Fri, 05 Aug 2022 14:08:38 -0600 + kdump-tools (1:1.8) unstable; urgency=medium [ Qi Zheng ] @@ -16,6 +49,19 @@ kdump-tools (1:1.8) unstable; urgency=me -- dann frazier Thu, 04 Aug 2022 15:28:51 -0600 +kdump-tools (1:1.7ubuntu1) kinetic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + - Update default s390x crashkernel. + - Install the updated zipl.conf with ucf, so users will be able to + decide whether to pick any crashkernel changes. + + -- dann frazier Fri, 10 Jun 2022 07:55:51 -0600 + kdump-tools (1:1.7) unstable; urgency=medium [ Guilherme G. Piccoli ] @@ -26,12 +72,45 @@ kdump-tools (1:1.7) unstable; urgency=me -- dann frazier Thu, 09 Jun 2022 15:29:58 -0600 +kdump-tools (1:1.6.10ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + - Update default s390x crashkernel. + - Install the updated zipl.conf with ucf, so users will be able to + decide whether to pick any crashkernel changes. + + -- dann frazier Thu, 24 Mar 2022 11:42:57 -0600 + kdump-tools (1:1.6.10) unstable; urgency=medium * kdump-config: Fix FTBFS due to new shellcheck warning (Closes: #1002270). -- dann frazier Wed, 22 Dec 2021 08:38:12 -0700 +kdump-tools (1:1.6.9ubuntu2) jammy; urgency=low + + * Update default s390x crashkernel. + - Install the updated zipl.conf with ucf, so users will be able to + decide whether to pick any crashkernel changes. (LP: #1877533). + + -- Thadeu Lima de Souza Cascardo Thu, 02 Dec 2021 15:13:23 -0300 + +kdump-tools (1:1.6.9ubuntu1) impish; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + * Restore shellcheck ignore directives for retired SC2039, which is not + yet retired in impish's shellcheck. + + -- dann frazier Tue, 24 Aug 2021 11:37:38 -0600 + kdump-tools (1:1.6.9) unstable; urgency=medium [ Benjamin Drung ] @@ -55,6 +134,16 @@ kdump-tools (1:1.6.9) unstable; urgency= -- dann frazier Mon, 23 Aug 2021 17:02:58 -0600 +kdump-tools (1:1.6.8.4ubuntu1) impish; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + + -- dann frazier Fri, 23 Jul 2021 09:00:16 -0600 + kdump-tools (1:1.6.8.4) unstable; urgency=medium [ Benjamin Drung ] @@ -66,6 +155,16 @@ kdump-tools (1:1.6.8.4) unstable; urgenc -- dann frazier Thu, 22 Jul 2021 15:18:37 -0600 +kdump-tools (1:1.6.8.3ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + + -- dann frazier Tue, 23 Mar 2021 08:49:04 -0600 + kdump-tools (1:1.6.8.3) unstable; urgency=medium * kdump-config: Fix storage of local/NFS dump files @@ -73,6 +172,16 @@ kdump-tools (1:1.6.8.3) unstable; urgenc -- dann frazier Mon, 22 Mar 2021 21:39:59 -0600 +kdump-tools (1:1.6.8.2ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + + -- dann frazier Mon, 08 Feb 2021 12:49:19 -0700 + kdump-tools (1:1.6.8.2) unstable; urgency=medium * debian/control: Add Vcs-* tags. @@ -90,6 +199,16 @@ kdump-tools (1:1.6.8.1) unstable; urgenc -- dann frazier Mon, 18 Jan 2021 07:48:47 -0700 +makedumpfile (1:1.6.8-2ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + + -- dann frazier Mon, 28 Dec 2020 09:42:26 -0700 + makedumpfile (1:1.6.8-2) unstable; urgency=medium * systemd: Use journal for StandardOutput instead of syslog, which @@ -97,6 +216,16 @@ makedumpfile (1:1.6.8-2) unstable; urgen -- dann frazier Sun, 27 Dec 2020 08:44:02 -0700 +makedumpfile (1:1.6.8-1ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + + -- Gianfranco Costamagna Thu, 03 Dec 2020 08:09:38 +0100 + makedumpfile (1:1.6.8-1) unstable; urgency=medium [ Benjamin Drung ] @@ -117,6 +246,17 @@ makedumpfile (1:1.6.8-1) unstable; urgen -- dann frazier Tue, 01 Dec 2020 08:34:43 -0700 +makedumpfile (1:1.6.7-4ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + - d/p/0003-align_PMD_SECTION_MASK_with_PHYS_MASK.patch + + -- Gianfranco Costamagna Wed, 12 Aug 2020 10:53:22 +0200 + makedumpfile (1:1.6.7-4) unstable; urgency=medium [ Guilherme G. Piccoli ] @@ -129,6 +269,17 @@ makedumpfile (1:1.6.7-4) unstable; urgen -- Thadeu Lima de Souza Cascardo Tue, 04 Aug 2020 17:21:46 -0300 +makedumpfile (1:1.6.7-3ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control/tests: sleep while waiting for systemd service. + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + - d/p/0003-align_PMD_SECTION_MASK_with_PHYS_MASK.patch + + -- Gianfranco Costamagna Wed, 29 Jul 2020 13:49:38 +0200 + makedumpfile (1:1.6.7-3) unstable; urgency=medium [ Debian Janitor ] @@ -149,6 +300,39 @@ makedumpfile (1:1.6.7-2) unstable; urgen -- Thadeu Lima de Souza Cascardo Fri, 17 Apr 2020 14:12:04 -0300 +makedumpfile (1:1.6.7-1ubuntu3) groovy; urgency=medium + + * d/p/0003-align_PMD_SECTION_MASK_with_PHYS_MASK.patch (LP: #1869465) + - Fixing arm64 systems makedumpfile looping forever exhausting + all memory when filtering kernel core. + + -- Ioanna Alifieraki Thu, 04 Jun 2020 14:36:01 +0100 + +makedumpfile (1:1.6.7-1ubuntu2) focal; urgency=low + + * debian/control/tests: sleep while waiting for systemd service. + Also, exit in case the service is not successfully started, and dump + status output for debugging. + This is necessary because now that the initrd is not generated during + postinst, it will be generated when the service is first started, and that + may delay it for a few seconds. + + -- Thadeu Lima de Souza Cascardo Tue, 17 Mar 2020 16:40:38 -0300 + +makedumpfile (1:1.6.7-1ubuntu1) focal; urgency=low + + [ Thadeu Lima de Souza Cascardo ] + * Merge from Debian unstable. Remaining changes: + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + - Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. + + [ Dan Streetman ] + * FeatureFreeze exception note: + I checked upstream log from 1.6.6-1.6.7 and confirmed this is bugfix-only + + -- Dan Streetman Fri, 13 Mar 2020 10:25:32 -0400 + makedumpfile (1:1.6.7-1) unstable; urgency=medium * Update to new upstream version 1.6.7. @@ -156,6 +340,34 @@ makedumpfile (1:1.6.7-1) unstable; urgen -- Thadeu Lima de Souza Cascardo Mon, 02 Mar 2020 04:48:06 -0300 +makedumpfile (1:1.6.6-4ubuntu3) focal; urgency=medium + + * No-change rebuild with fixed binutils on arm64. + + -- Matthias Klose Sat, 08 Feb 2020 11:06:59 +0000 + +makedumpfile (1:1.6.6-4ubuntu2) focal; urgency=medium + + * x86_64: Fix an error due to makedumpfile being out-of-sync with recent + kernels. To achieve that, add the following patch: "Increase + SECTION_MAP_LAST_BIT to 4". (LP: #1857616) + + -- Guilherme G. Piccoli Fri, 03 Jan 2020 16:57:00 -0300 + +makedumpfile (1:1.6.6-4ubuntu1) focal; urgency=medium + + [ Thadeu Lima de Souza Cascardo ] + * Merge from Debian unstable. Remaining changes: + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + * Use reset_devices as a cmdline parameter. (LP: #1800566) + * Use kdump-config reload after cpu or memory hotplug. (LP: #1828596) + + [ Guilherme G. Piccoli ] + * Add a systemd-resolved service dependency in order kdump-tools is able + to resolve DNS when in kdump boot. (LP: #1856323) + + -- Thadeu Lima de Souza Cascardo Wed, 18 Dec 2019 14:38:51 -0300 + makedumpfile (1:1.6.6-4) unstable; urgency=medium * Let the kernel decide the crashkernel offset for ppc64el (LP: #1741860) @@ -173,6 +385,19 @@ makedumpfile (1:1.6.6-3) unstable; urgen -- Thadeu Lima de Souza Cascardo Wed, 18 Sep 2019 01:00:16 +0000 +makedumpfile (1:1.6.6-2ubuntu1) eoan; urgency=medium + + [ Thadeu Lima de Souza Cascardo ] + * Merge from Debian unstable. Remaining changes: + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + * Add kdump retry/delay mechanism when dumping over network (LP: #1681909) + * Allow proper reload of kdump after multiple hotplug events. (LP: #1828596) + + [ Connor Kuehl ] + * Let the kernel decide the crashkernel offset for ppc64el (LP: #1741860) + + -- Thadeu Lima de Souza Cascardo Tue, 06 Aug 2019 12:18:15 -0300 + makedumpfile (1:1.6.6-2) unstable; urgency=medium [ Guilherme G. Piccoli ] @@ -192,6 +417,33 @@ makedumpfile (1:1.6.6-1) unstable; urgen -- Thadeu Lima de Souza Cascardo Fri, 12 Jul 2019 16:24:14 -0300 +makedumpfile (1:1.6.5-1ubuntu3) eoan; urgency=medium + + * debian/kdump-config.in: + - Add kdump retry/delay mechanism when dumping over network. + (LP: #1681909) + + -- Guilherme G. Piccoli Thu, 04 Jul 2019 15:20:53 -0300 + +makedumpfile (1:1.6.5-1ubuntu2) eoan; urgency=medium + + [ Thadeu Lima de Souza Cascardo ] + * Use maxcpus instead of nr_cpus on ppc64el. (LP: #1828597) + * Reload kdump when CPU is brought online. (LP: #1828596) + + -- Thadeu Lima de Souza Cascardo Fri, 14 Jun 2019 10:58:40 -0300 + +makedumpfile (1:1.6.5-1ubuntu1) disco; urgency=low + + [ Ubuntu Merge-o-Matic ] + * Merge from Debian unstable. Remaining changes: + - Bump amd64 crashkernel from 384M-:128M to 512M-:192M. + + [ Thadeu Lima de Souza Cascardo ] + * Use a different service for vmcore dump. (LP: #1811692) + + -- Thadeu Lima de Souza Cascardo Mon, 14 Jan 2019 15:42:44 -0200 + makedumpfile (1:1.6.5-1) unstable; urgency=medium * Update to new upstream version 1.6.5. @@ -208,6 +460,14 @@ makedumpfile (1:1.6.4-3) unstable; urgen -- Thadeu Lima de Souza Cascardo Tue, 16 Oct 2018 15:30:16 -0300 +makedumpfile (1:1.6.4-2ubuntu1) cosmic; urgency=medium + + * Bump amd64 crashkernel from 384M-:128M to 512M-:196M. Other + arches, like arm64 & ppc64el already use much higher minimum + threshold of 2G. This needs to be revisited post release. + + -- Dimitri John Ledkov Mon, 15 Oct 2018 10:36:36 +0200 + makedumpfile (1:1.6.4-2) unstable; urgency=medium * Ignore uninstalled kernels when doing the kernel postinst. (Closes: #904524) diff -pruN 1:1.8.1/debian/control 1:1.8.1ubuntu1/debian/control --- 1:1.8.1/debian/control 2023-01-01 17:53:45.000000000 +0000 +++ 1:1.8.1ubuntu1/debian/control 2023-01-02 18:07:03.000000000 +0000 @@ -1,7 +1,8 @@ Source: kdump-tools Section: devel Priority: optional -Maintainer: Debian Kdump +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Kdump Uploaders: dann frazier , Thadeu Lima de Souza Cascardo Standards-Version: 4.5.1 diff -pruN 1:1.8.1/debian/kdump-tools-dump.service 1:1.8.1ubuntu1/debian/kdump-tools-dump.service --- 1:1.8.1/debian/kdump-tools-dump.service 2023-01-01 17:53:45.000000000 +0000 +++ 1:1.8.1ubuntu1/debian/kdump-tools-dump.service 2023-01-02 18:07:03.000000000 +0000 @@ -1,7 +1,7 @@ [Unit] Description=Kernel crash dump capture service -Wants=network-online.target -After=network-online.target +Wants=network-online.target dbus.socket systemd-resolved.service +After=network-online.target dbus.socket systemd-resolved.service [Service] Type=oneshot diff -pruN 1:1.8.1/debian/kdump-tools.grub.default 1:1.8.1ubuntu1/debian/kdump-tools.grub.default --- 1:1.8.1/debian/kdump-tools.grub.default 2023-01-01 17:53:45.000000000 +0000 +++ 1:1.8.1ubuntu1/debian/kdump-tools.grub.default 2023-01-02 18:07:03.000000000 +0000 @@ -1 +1 @@ -GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT crashkernel=384M-:128M" +GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT crashkernel=512M-:192M" diff -pruN 1:1.8.1/debian/kdump-tools.postinst 1:1.8.1ubuntu1/debian/kdump-tools.postinst --- 1:1.8.1/debian/kdump-tools.postinst 2023-01-01 17:53:45.000000000 +0000 +++ 1:1.8.1ubuntu1/debian/kdump-tools.postinst 2023-01-02 18:07:03.000000000 +0000 @@ -22,6 +22,34 @@ update_param() { mv -f "$INITCONFFILE.$$" "$INITCONFFILE" } +ZIPL_CONFFILE="/etc/zipl.conf" + +update_zipl() { + + if [ ! -f "${ZIPL_CONFFILE}" ]; then + return; + fi + + TMPCONF=$(mktemp) + cp "${ZIPL_CONFFILE}" "${TMPCONF}" + + CRASHKERNEL="${1}" + HAS_CRASHKERNEL="$(grep -q crashkernel "${TMPCONF}")" || true + + if test -z "${HAS_CRASHKERNEL}"; then + sed -i "s|^\\s*parameters\\s*=\\s*\"\\?|&crashkernel=${CRASHKERNEL} |" "${TMPCONF}" + else + sed -i "s/crashkernel=[^[:space:]\"]*/crashkernel=${CRASHKERNEL}/" "${TMPCONF}" + fi + + ucf --debconf-ok "${TMPCONF}" "${ZIPL_CONFFILE}" + rm -f "${TMPCONF}" + + if [ -e /usr/sbin/zipl ]; then + /usr/sbin/zipl + fi +} + # summary of how this script can be called: # * `configure' # * `abort-upgrade' @@ -55,14 +83,10 @@ case "$1" in # Customize crashkernel= value according to architecture ARCH="$(arch)" - DEF_PRESET="384M-:128M" case "$ARCH" in s390x) - HAS_CRASHKERNEL="$(grep crashkernel /etc/zipl.conf)" || true - if test -z "$HAS_CRASHKERNEL"; then - sed -i "s|^\\s*parameters\\s*=\\s*\"\\?|&crashkernel=${DEF_PRESET} |" /etc/zipl.conf - zipl - fi + CRASHKERNEL="2G-4G:320M,4G-32G:512M,32G-64G:1024M,64G-128G:2048M,128G-:4096M" + update_zipl "${CRASHKERNEL}" CIO_IGNORE="$(cio_ignore -u -k)" sed -i "s/\\#KDUMP_CMDLINE_APPEND/KDUMP_CMDLINE_APPEND/" "$INITCONFFILE" sed -i "/KDUMP_CMDLINE_APPEND/{s|\"$| ${CIO_IGNORE}\"|}" "$INITCONFFILE" diff -pruN 1:1.8.1/debian/tests/crash 1:1.8.1ubuntu1/debian/tests/crash --- 1:1.8.1/debian/tests/crash 2023-01-01 17:53:45.000000000 +0000 +++ 1:1.8.1ubuntu1/debian/tests/crash 2023-01-02 18:07:03.000000000 +0000 @@ -25,6 +25,7 @@ function wait_for_systemd_service() ! systemctl is-failed kdump-tools && [ $TIMEOUT -gt 0 ] ; do TIMEOUT=$((TIMEOUT - 1)) + sleep 1 done } @@ -57,8 +58,13 @@ case "$AUTOPKGTEST_REBOOT_MARK" in report "waiting for kdump-tools systemd service" wait_for_systemd_service if systemctl is-failed kdump-tools; then + systemctl status kdump-tools error "kdump-tools systemd service failed" fi + if ! systemctl is-active kdump-tools; then + systemctl status kdump-tools + error "kdump-tools systemd service is not active" + fi report "checking kdump-config status" if ! kdump-config status | grep ": ready to kdump" > /dev/null; then error "kdump is not ready"