| Message ID | 20180422054925.GA24246@beast |
|---|---|
| State | New |
| Headers | show |
| Series | [bionic] UBUNTU: [Packaging] Keep required watchdog for Raspberry Pi | expand |
On Sat, Apr 21, 2018 at 10:49:25PM -0700, Kees Cook wrote: > The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually > reboot and shutdown. It should not get automatically blacklisted. See > https://github.com/raspberrypi/linux/issues/2523 > > Closes LP: #1766052 > > Signed-off-by: Kees Cook <kees@ubuntu.com> > --- > debian/rules.d/2-binary-arch.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk > index 72e55fc6815c..07c5e6e3e138 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -183,6 +183,7 @@ endif > echo "# Autogenerated watchdog blacklist" \ > >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf > ls -1 $(pkgdir)/lib/modules/$(abi_release)-$*/kernel/drivers/watchdog/ | \ > + grep -v '^bcm2835_wdt$$' \ In concept I think this change is okay, but it's missing a pipe.
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 72e55fc6815c..07c5e6e3e138 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -183,6 +183,7 @@ endif echo "# Autogenerated watchdog blacklist" \ >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf ls -1 $(pkgdir)/lib/modules/$(abi_release)-$*/kernel/drivers/watchdog/ | \ + grep -v '^bcm2835_wdt$$' \ sed -e 's/^/blacklist /' -e 's/.ko$$//' | \ sort -u \ >>$(pkgdir)/lib/modprobe.d/blacklist_$(src_pkg_name)_$(abi_release)-$*.conf
The bcm2835_wdt.ko module is required for Raspberry Pi systems to actually reboot and shutdown. It should not get automatically blacklisted. See https://github.com/raspberrypi/linux/issues/2523 Closes LP: #1766052 Signed-off-by: Kees Cook <kees@ubuntu.com> --- debian/rules.d/2-binary-arch.mk | 1 + 1 file changed, 1 insertion(+)