Merge lp:~morphis/lxc-android-config/add-ics-dhcp-overrides into lp:lxc-android-config

Proposed by Simon Fels
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 15
Merged at revision: 15
Proposed branch: lp:~morphis/lxc-android-config/add-ics-dhcp-overrides
Merge into: lp:lxc-android-config
Diff against target: 15 lines (+6/-0)
2 files modified
etc/init/isc-dhcp-server.override (+3/-0)
etc/init/isc-dhcp-server6.override (+3/-0)
To merge this branch: bzr merge lp:~morphis/lxc-android-config/add-ics-dhcp-overrides
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
Review via email: mp+292767@code.launchpad.net

Commit message

Add upstart overrides for ics-dhcp-server to prevent it from starting

We install ics-dchp-server but it will be manually started by other management services in the system and we don't want it started on system boot.

To post a comment you must log in.
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'etc/init/isc-dhcp-server.override'
2--- etc/init/isc-dhcp-server.override 1970-01-01 00:00:00 +0000
3+++ etc/init/isc-dhcp-server.override 2016-04-25 09:23:43 +0000
4@@ -0,0 +1,3 @@
5+# We don't need the DHCP server running from boot on as we're
6+# starting it manually when needed.
7+manual
8
9=== added file 'etc/init/isc-dhcp-server6.override'
10--- etc/init/isc-dhcp-server6.override 1970-01-01 00:00:00 +0000
11+++ etc/init/isc-dhcp-server6.override 2016-04-25 09:23:43 +0000
12@@ -0,0 +1,3 @@
13+# We don't need the DHCP server running from boot on as we're
14+# starting it manually when needed.
15+manual

Subscribers

People subscribed via source and target branches