diff -Nru makedumpfile-1.6.6/debian/50-kdump-tools.rules makedumpfile-1.6.6/debian/50-kdump-tools.rules --- makedumpfile-1.6.6/debian/50-kdump-tools.rules 2019-07-20 13:02:04.000000000 -0300 +++ makedumpfile-1.6.6/debian/50-kdump-tools.rules 2019-12-18 14:38:51.000000000 -0300 @@ -1,5 +1,5 @@ -SUBSYSTEM=="memory", ACTION=="online", PROGRAM="/bin/systemctl reset-failed kdump-tools.service ; /bin/systemctl try-restart kdump-tools.service" -SUBSYSTEM=="memory", ACTION=="offline", PROGRAM="/bin/systemctl reset-failed kdump-tools.service ; /bin/systemctl try-restart kdump-tools.service" -SUBSYSTEM=="cpu", ACTION=="add", PROGRAM="/bin/systemctl reset-failed kdump-tools.service ; /bin/systemctl try-restart kdump-tools.service" -SUBSYSTEM=="cpu", ACTION=="remove", PROGRAM="/bin/systemctl reset-failed kdump-tools.service ; /bin/systemctl try-restart kdump-tools.service" -SUBSYSTEM=="cpu", ACTION=="online", PROGRAM="/bin/systemctl reset-failed kdump-tools.service ; /bin/systemctl try-restart kdump-tools.service" +SUBSYSTEM=="memory", ACTION=="online", PROGRAM="/usr/sbin/kdump-config try-reload" +SUBSYSTEM=="memory", ACTION=="offline", PROGRAM="/usr/sbin/kdump-config try-reload" +SUBSYSTEM=="cpu", ACTION=="add", PROGRAM="/usr/sbin/kdump-config try-reload" +SUBSYSTEM=="cpu", ACTION=="remove", PROGRAM="/usr/sbin/kdump-config try-reload" +SUBSYSTEM=="cpu", ACTION=="online", PROGRAM="/usr/sbin/kdump-config try-reload" diff -Nru makedumpfile-1.6.6/debian/changelog makedumpfile-1.6.6/debian/changelog --- makedumpfile-1.6.6/debian/changelog 2019-08-06 12:18:15.000000000 -0300 +++ makedumpfile-1.6.6/debian/changelog 2019-12-18 14:38:51.000000000 -0300 @@ -1,3 +1,34 @@ +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) + * kdump-config: implement try-reload + * udev: hotplug: use try-reload + * Set Rules-Requires-Root to no + + -- Thadeu Lima de Souza Cascardo Wed, 18 Dec 2019 10:50:47 -0300 + +makedumpfile (1:1.6.6-3) unstable; urgency=medium + + * Add a reload command. + * Use kdump-config reload after cpu or memory hotplug. + * Use reset_devices as a cmdline parameter. + + -- 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 ] diff -Nru makedumpfile-1.6.6/debian/control makedumpfile-1.6.6/debian/control --- makedumpfile-1.6.6/debian/control 2019-07-20 11:25:01.000000000 -0300 +++ makedumpfile-1.6.6/debian/control 2019-12-18 14:38:51.000000000 -0300 @@ -14,6 +14,7 @@ po-debconf Vcs-Git: https://salsa.debian.org/debian/makedumpfile.git Vcs-Browser: https://salsa.debian.org/debian/makedumpfile +Rules-Requires-Root: no Package: makedumpfile Architecture: i386 amd64 powerpc ia64 x32 arm64 armel armhf ppc64el s390x diff -Nru makedumpfile-1.6.6/debian/kdump-config.in makedumpfile-1.6.6/debian/kdump-config.in --- makedumpfile-1.6.6/debian/kdump-config.in 2019-07-20 13:01:39.000000000 -0300 +++ makedumpfile-1.6.6/debian/kdump-config.in 2019-12-18 14:38:51.000000000 -0300 @@ -65,6 +65,7 @@ sys_fadump_enabled=/sys/kernel/fadump_enabled sys_fadump_registered=/sys/kernel/fadump_registered kexec_cmd_file=$KDUMP_COREDIR/kexec_cmd +lock_file=$KDUMP_COREDIR/kdump_lock # DUMP_MODE = kdump/fadump # The default dump mode is kdump. @@ -891,7 +892,47 @@ } +load() +{ + if [ "$DUMP_MODE" == "fadump" ]; then + check_fadump_support; + fadump_register + else + check_kdump_support; + kdump_create_symlinks $KVER; + manage_symlinks; + locate_kdump_kernel; + kdump_load + fi +} +unload() +{ + if [ "$DUMP_MODE" == "fadump" ]; then + fadump_unregister + else + kdump_unload + fi +} + +reload() +{ + unload + load +} + +condreload() +{ + local sys_loaded="$sys_kexec_crash" + if [ "$DUMP_MODE" == "fadump" ] ; then + check_fadump_support + sys_loaded="$sys_fadump_registered" + fi + flock 9 + if [ -e $sys_loaded -a `cat $sys_loaded` -eq 1 ] ; then + reload + fi +} case "$1" in test) @@ -916,23 +957,16 @@ kdump_show ;; load) - if [ "$DUMP_MODE" == "fadump" ]; then - check_fadump_support; - fadump_register - else - check_kdump_support; - kdump_create_symlinks $KVER; - manage_symlinks; - locate_kdump_kernel; - kdump_load - fi + load ;; unload) - if [ "$DUMP_MODE" == "fadump" ]; then - fadump_unregister - else - kdump_unload - fi + unload + ;; + reload) + reload + ;; + condreload|try-reload) + condreload 9>$lock_file ;; status) if [ "$DUMP_MODE" == "fadump" ]; then diff -Nru makedumpfile-1.6.6/debian/kdump-tools-dump.service makedumpfile-1.6.6/debian/kdump-tools-dump.service --- makedumpfile-1.6.6/debian/kdump-tools-dump.service 2019-07-20 11:25:01.000000000 -0300 +++ makedumpfile-1.6.6/debian/kdump-tools-dump.service 2019-12-18 14:38:51.000000000 -0300 @@ -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 -Nru makedumpfile-1.6.6/debian/rules makedumpfile-1.6.6/debian/rules --- makedumpfile-1.6.6/debian/rules 2019-07-20 11:25:01.000000000 -0300 +++ makedumpfile-1.6.6/debian/rules 2019-12-18 14:38:51.000000000 -0300 @@ -7,7 +7,7 @@ SUBSTVARS = -Vdist:Depends="kexec-tools" endif -KDUMP_CMDLINE_APPEND = systemd.unit=kdump-tools-dump.service +KDUMP_CMDLINE_APPEND = reset_devices systemd.unit=kdump-tools-dump.service ifeq ($(DEB_HOST_ARCH),arm64) KDUMP_CMDLINE_APPEND += nr_cpus=1 else ifeq ($(DEB_HOST_ARCH),ppc64el)