From e6c0911c9bb58cad327c5780a33b575e4cf265c0 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 30 Apr 2013 07:51:59 +0000 Subject: dhcp: do not start dhclient by default on boot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * most of the time start fails: | root@overo:~# systemctl status dhclient.service | dhclient.service - Dynamic Host Configuration Protocol (DHCP) | Loaded: loaded (/lib/systemd/system/dhclient.service; enabled) | Active: failed (Result: resources) since Thu 2000-01-06 22:07:27 UTC; 15min ago | Process: 300 ExecStart=/sbin/dhclient -cf /etc/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $INTERFACES (code=exited, status=0/SUCCESS) | | Jan 06 22:07:27 overo systemd[1]: Starting Dynamic Host Configuration Proto..... | Jan 06 22:07:27 overo systemd[1]: PID file /var/run/dhclient.pid not readab...t. | Jan 06 22:07:27 overo systemd[1]: Failed to start Dynamic Host Configuratio...). * in cases it does not fail to start and we have a managing service (e.g networkmanager) two instances of dhclient are running Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-systemd/oe-core') diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend index 22d412a25d..e9e09d34d3 100644 --- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend +++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend @@ -3,12 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit systemd -PRINC := "${@int(PRINC) + 2}" +PRINC := "${@int(PRINC) + 3}" SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" SYSTEMD_SERVICE_dhcp-client = "dhclient.service" +SYSTEMD_AUTO_ENABLE_dhcp-client = "disable" FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service" FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service" -- cgit 1.2.3-korg