Merge lp:~till-kamppeter/lxc-android-config/cups-override into lp:lxc-android-config

[Till Kamppeter]

Removed the "-x 30" from the cupsd command line of /etc/init/cups.override, as current cupsd does not support this option any more.

Added/updated *.override files for avahi-daemon, cups-browsed, and cups to be run on-demand and with adapted command line options.

Removed the "-x 30" from the cupsd command line of /etc/init/cups.override, as current cupsd does not support this option any more.

Added/updated *.override files for avahi-daemon, cups-browsed, and cups to be run on-demand and with adapted command line options.

Currently I am introducing the printing stack into the Ubuntu Phone OS/Ubuntu Touch.

See bug 1520346 and bug 1538701.

See also https://blueprints.launchpad.net/ubuntu/+spec/client-1305-printing-stack-with-mobile-in-mind

[Simon Fels (morphis)]

LGTM but needs proper landing through the citrain

review: Approve

[lp:~till-kamppeter/lxc-android-config/cups-override]

13. By Till Kamppeter on 2016-01-27

Updated the *.override files for printing with daemons running on-demand

[Till Kamppeter (till-kamppeter)]

Updated the merge proposal to also cover bug 1538701, as not only cupsd but also cups-browsed and avahi-daemon need to be started on-demand, the latter two triggered by the print dialog.

=== added file 'etc/init/avahi-daemon.override'
--- etc/init/avahi-daemon.override	1970-01-01 00:00:00 +0000
+++ etc/init/avahi-daemon.override	2016-01-27 01:15:27 +0000
@@ -0,0 +1,4 @@
+# avahi-daemon - mDNS/DNS-SD daemon
+# overrides for touch
+# do not start avahi-daemon on boot
+manual

=== added file 'etc/init/cups-browsed.override'
--- etc/init/cups-browsed.override	1970-01-01 00:00:00 +0000
+++ etc/init/cups-browsed.override	2016-01-27 01:15:27 +0000
@@ -0,0 +1,9 @@
+# cups-browsed - Bonjour remote printer browsing daemon
+# overrides for touch
+# do not start cups-browsed on boot
+manual
+# do not respawn when cups-browsed shuts down by itself
+normal exit 0
+# start cups-browsed in auto-shutdown mode, creating queues for native IPP
+# network printers, and using IPv4 IPs to reference remote printers
+exec /usr/sbin/cups-browsed --autoshutdown=avahi -o IPBasedDeviceURIs=IPv4 -o CreateIPPPrinterQueues=Yes

=== modified file 'etc/init/cups.override'
--- etc/init/cups.override	2015-09-02 07:50:44 +0000
+++ etc/init/cups.override	2016-01-27 01:15:27 +0000
@@ -1,4 +1,8 @@
 # cups - CUPS Printing spooler and server
-# socket activation overrides for touch
+# overrides for touch
+# socket activation
 start on socket PROTO=inet PORT=631 ADDR=127.0.0.1
-exec /usr/sbin/cupsd -f -x 30
+# do not respawn when cupsd shuts down by itself
+normal exit 0
+# start cupsd in auto-shutdown mode
+exec /usr/sbin/cupsd -f -l