diff -Nru makedumpfile-1.6.3/debian/50-kdump-tools.rules makedumpfile-1.6.3/debian/50-kdump-tools.rules --- makedumpfile-1.6.3/debian/50-kdump-tools.rules 1969-12-31 21:00:00.000000000 -0300 +++ makedumpfile-1.6.3/debian/50-kdump-tools.rules 2019-12-18 16:05:56.000000000 -0300 @@ -0,0 +1,5 @@ +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.3/debian/changelog makedumpfile-1.6.3/debian/changelog --- makedumpfile-1.6.3/debian/changelog 2018-05-21 11:02:15.000000000 -0300 +++ makedumpfile-1.6.3/debian/changelog 2019-12-18 16:06:16.000000000 -0300 @@ -1,3 +1,16 @@ +makedumpfile (1:1.6.3-2~16.04.2) xenial; urgency=medium + + * Let the kernel decide the crashkernel offset for ppc64el (LP: #1741860) + * Reload kdump after memory/CPU hotplug. (LP: #1655280) + * Use a different service for vmcore dump. (LP: #1811692) + * Reload kdump when CPU is brought online. (LP: #1828596) + * Add a reload command. (LP: #1828596) + * kdump-config: implement try-reload (LP: #1828596) + * udev: hotplug: use try-reload (LP: #1828596) + * Use reset_devices as a cmdline parameter. (LP: #1800566) + + -- Thadeu Lima de Souza Cascardo Wed, 18 Dec 2019 16:06:16 -0300 + makedumpfile (1:1.6.3-2~16.04.1) xenial; urgency=medium * Backport latest makedumpfile to xenial. (LP: #1746299) diff -Nru makedumpfile-1.6.3/debian/kdump-config.in makedumpfile-1.6.3/debian/kdump-config.in --- makedumpfile-1.6.3/debian/kdump-config.in 2018-03-05 09:28:55.000000000 -0300 +++ makedumpfile-1.6.3/debian/kdump-config.in 2019-12-18 16:05:46.000000000 -0300 @@ -63,6 +63,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. @@ -867,7 +868,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) @@ -892,23 +933,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.3/debian/kdump-tools-dump.service makedumpfile-1.6.3/debian/kdump-tools-dump.service --- makedumpfile-1.6.3/debian/kdump-tools-dump.service 1969-12-31 21:00:00.000000000 -0300 +++ makedumpfile-1.6.3/debian/kdump-tools-dump.service 2019-12-18 15:22:38.000000000 -0300 @@ -0,0 +1,12 @@ +[Unit] +Description=Kernel crash dump capture service +Wants=network-online.target +After=network-online.target + +[Service] +Type=oneshot +StandardOutput=syslog+console +EnvironmentFile=/etc/default/kdump-tools +ExecStart=/etc/init.d/kdump-tools start +ExecStop=/etc/init.d/kdump-tools stop +RemainAfterExit=yes diff -Nru makedumpfile-1.6.3/debian/kdump-tools.grub.ppc64el makedumpfile-1.6.3/debian/kdump-tools.grub.ppc64el --- makedumpfile-1.6.3/debian/kdump-tools.grub.ppc64el 2018-02-06 11:52:01.000000000 -0200 +++ makedumpfile-1.6.3/debian/kdump-tools.grub.ppc64el 2019-12-16 16:27:16.000000000 -0300 @@ -1 +1 @@ -GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT crashkernel=2G-4G:320M,4G-32G:512M,32G-64G:1024M,64G-128G:2048M,128G-:4096M@128M" +GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT crashkernel=2G-4G:320M,4G-32G:512M,32G-64G:1024M,64G-128G:2048M,128G-:4096M" diff -Nru makedumpfile-1.6.3/debian/kdump-tools.install makedumpfile-1.6.3/debian/kdump-tools.install --- makedumpfile-1.6.3/debian/kdump-tools.install 2018-02-06 11:52:01.000000000 -0200 +++ makedumpfile-1.6.3/debian/kdump-tools.install 2019-08-28 09:53:34.000000000 -0300 @@ -1,2 +1,4 @@ debian/kdump-config /usr/sbin debian/kdump-tools.conf /usr/share/kdump-tools/ +debian/50-kdump-tools.rules /lib/udev/rules.d/ +debian/kdump-tools-dump.service /lib/systemd/system/ diff -Nru makedumpfile-1.6.3/debian/kdump-tools.service makedumpfile-1.6.3/debian/kdump-tools.service --- makedumpfile-1.6.3/debian/kdump-tools.service 2018-02-06 13:37:32.000000000 -0200 +++ makedumpfile-1.6.3/debian/kdump-tools.service 2019-08-28 09:53:34.000000000 -0300 @@ -1,7 +1,5 @@ [Unit] Description=Kernel crash dump capture service -Wants=network-online.target -After=network-online.target [Service] Type=oneshot diff -Nru makedumpfile-1.6.3/debian/rules makedumpfile-1.6.3/debian/rules --- makedumpfile-1.6.3/debian/rules 2018-02-06 11:52:01.000000000 -0200 +++ makedumpfile-1.6.3/debian/rules 2019-12-18 16:06:03.000000000 -0300 @@ -7,7 +7,7 @@ SUBSTVARS = -Vdist:Depends="kexec-tools" endif -KDUMP_CMDLINE_APPEND = nr_cpus=1 systemd.unit=kdump-tools.service +KDUMP_CMDLINE_APPEND = reset_devices nr_cpus=1 systemd.unit=kdump-tools-dump.service ifeq ($(DEB_HOST_ARCH),arm64) # pass else ifeq ($(DEB_HOST_ARCH),ppc64el)