On Thu, 2015-05-28 at 18:55 +0100, Adam D. Barratt wrote: > Control: tags -1 + confirmed > > On Sun, 2015-05-10 at 13:45 +0100, Ian Campbell wrote: > > I'd like to fix #781886 "qcontrol failure to start on boot sometimes > > (jessie, > > systemd?)" in Jessie. > > > > The issue is that when running in LSB compat mode the devices may not have > > been > > created before the initscript runs. This isn't noticed under sysvinit > > because > > there is an implicit (or perhaps explicit) udev settle somewhere earlier on. > > > > However the proper fix (enabling full systemd support) is IMHO too intrusive > > for a stable update (see below for the full patch in case you disagree). So > > instead I would like to upload a workaround: > > Assuming that the workaround has been tested on jessie, please go ahead.
Thanks I've just uploaded 0.5.4-1+deb8u1 to jessie, debdiff below. I've tested it locally on Jessie, although the issue is intermittent. I should probably have though to mention this before, but src:qcontrol does generate udebs, which are included in the d-i initrds. The change in question does not impact them at all since they don't start the daemon and use qcontrol in one-shot mode only. I've CCd Kibi just in case this is an issue. Ian. diff -Nru qcontrol-0.5.4/debian/changelog qcontrol-0.5.4/debian/changelog --- qcontrol-0.5.4/debian/changelog 2014-04-11 17:40:46.000000000 +0100 +++ qcontrol-0.5.4/debian/changelog 2015-05-30 13:35:38.000000000 +0100 @@ -1,3 +1,11 @@ +qcontrol (0.5.4-1+deb8u1) jessie; urgency=medium + + * Wait for necessary devices to appear before starting. + (Closes: #781886). This works around an issue exposed by systemd LSB + compatibility mode. Proper systemd support will come later. + + -- Ian Campbell <i...@debian.org> Sat, 30 May 2015 13:35:21 +0100 + qcontrol (0.5.4-1) unstable; urgency=low * New upstream release 0.5.4. diff -Nru qcontrol-0.5.4/debian/qcontrol.qcontrold.init qcontrol-0.5.4/debian/qcontrol.qcontrold.init --- qcontrol-0.5.4/debian/qcontrol.qcontrold.init 2013-10-20 10:12:28.000000000 +0100 +++ qcontrol-0.5.4/debian/qcontrol.qcontrold.init 2015-05-30 13:35:38.000000000 +0100 @@ -38,6 +38,11 @@ case "$1" in start) + # Ensure that /dev/input/by-path/platform-gpio-keys-event has + # arrived. Under systemd LSB compatibility mode it may not + # have yet. + udevadm settle + log_daemon_msg "Starting qcontrol daemon" "qcontrol" if start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- -d; then log_end_msg 0
signature.asc
Description: This is a digitally signed message part