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

Proposed by Till Kamppeter on 2015-12-15
Status: Merged
Approved by: Ken VanDine on 2016-03-28
Approved revision: 13
Merged at revision: 12
Proposed branch: lp:~till-kamppeter/lxc-android-config/cups-override
Merge into: lp:lxc-android-config
Diff against target: 37 lines (+19/-2)
3 files modified
etc/init/avahi-daemon.override (+4/-0)
etc/init/cups-browsed.override (+9/-0)
etc/init/cups.override (+6/-2)
To merge this branch: bzr merge lp:~till-kamppeter/lxc-android-config/cups-override
Reviewer Review Type Date Requested Status
Simon Fels 2015-12-15 Approve on 2015-12-15
Review via email: mp+280585@code.launchpad.net

Commit message

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.

Description of the change

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

To post a comment you must log in.
Simon Fels (morphis) wrote :

LGTM but needs proper landing through the citrain

review: Approve
13. By Till Kamppeter on 2016-01-27

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

Till Kamppeter (till-kamppeter) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'etc/init/avahi-daemon.override'
2--- etc/init/avahi-daemon.override 1970-01-01 00:00:00 +0000
3+++ etc/init/avahi-daemon.override 2016-01-27 01:15:27 +0000
4@@ -0,0 +1,4 @@
5+# avahi-daemon - mDNS/DNS-SD daemon
6+# overrides for touch
7+# do not start avahi-daemon on boot
8+manual
9
10=== added file 'etc/init/cups-browsed.override'
11--- etc/init/cups-browsed.override 1970-01-01 00:00:00 +0000
12+++ etc/init/cups-browsed.override 2016-01-27 01:15:27 +0000
13@@ -0,0 +1,9 @@
14+# cups-browsed - Bonjour remote printer browsing daemon
15+# overrides for touch
16+# do not start cups-browsed on boot
17+manual
18+# do not respawn when cups-browsed shuts down by itself
19+normal exit 0
20+# start cups-browsed in auto-shutdown mode, creating queues for native IPP
21+# network printers, and using IPv4 IPs to reference remote printers
22+exec /usr/sbin/cups-browsed --autoshutdown=avahi -o IPBasedDeviceURIs=IPv4 -o CreateIPPPrinterQueues=Yes
23
24=== modified file 'etc/init/cups.override'
25--- etc/init/cups.override 2015-09-02 07:50:44 +0000
26+++ etc/init/cups.override 2016-01-27 01:15:27 +0000
27@@ -1,4 +1,8 @@
28 # cups - CUPS Printing spooler and server
29-# socket activation overrides for touch
30+# overrides for touch
31+# socket activation
32 start on socket PROTO=inet PORT=631 ADDR=127.0.0.1
33-exec /usr/sbin/cupsd -f -x 30
34+# do not respawn when cupsd shuts down by itself
35+normal exit 0
36+# start cupsd in auto-shutdown mode
37+exec /usr/sbin/cupsd -f -l

Subscribers

People subscribed via source and target branches