diff -Nru livecd-rootfs-2.420+ppa50/debian/changelog livecd-rootfs-2.420+ppa51/debian/changelog --- livecd-rootfs-2.420+ppa50/debian/changelog 2016-11-03 11:39:45.000000000 +0000 +++ livecd-rootfs-2.420+ppa51/debian/changelog 2016-12-07 13:49:04.000000000 +0000 @@ -1,3 +1,11 @@ +livecd-rootfs (2.420+ppa51) xenial; urgency=medium + + * live-build/ubuntu-core/hooks/80-remove-blacklist-watchdog-file.chroot + remove blacklist-watchdog.conf during build so systems can load their + watchdog modules for systemd usage (LP: 1647992) + + -- Oliver Grawert Wed, 07 Dec 2016 14:47:43 +0100 + livecd-rootfs (2.420+ppa50) xenial; urgency=medium * live-build/ubuntu-core/hooks/18-set-os-release.chroot: diff -Nru livecd-rootfs-2.420+ppa50/live-build/ubuntu-core/hooks/80-remove-blacklist-watchdog-file.chroot livecd-rootfs-2.420+ppa51/live-build/ubuntu-core/hooks/80-remove-blacklist-watchdog-file.chroot --- livecd-rootfs-2.420+ppa50/live-build/ubuntu-core/hooks/80-remove-blacklist-watchdog-file.chroot 1970-01-01 00:00:00.000000000 +0000 +++ livecd-rootfs-2.420+ppa51/live-build/ubuntu-core/hooks/80-remove-blacklist-watchdog-file.chroot 2016-12-07 13:47:33.000000000 +0000 @@ -0,0 +1,7 @@ +#! /bin/sh -ex + +# we want the watchdog modules to load for now so that +# a systemd watchdog setup can use the modules +# (LP: #1647992) + +rm -f /etc/modprobe.d/blacklist-watchdog.conf