From patchwork Mon Nov 14 04:27:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 01/21] dhcp: generate initial leases files for server Date: Mon, 14 Nov 2011 04:27:51 -0000 From: Saul Wold X-Patchwork-Id: 14891 Message-Id: <571b1f97de9d4b314cb84fec96dde1cb365c4219.1321244755.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Otavio Salvador If not using the init script it fails as the leases are created by it. When used with systemd, this fails without the leases thus this allows it to work out of box. Signed-off-by: Otavio Salvador Added commit meesage from Otavio's email Signed-off-by: Saul Wold --- meta/recipes-connectivity/dhcp/dhcp.inc | 9 ++++++++- meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc index 1cc529d..f9d80e7 100644 --- a/meta/recipes-connectivity/dhcp/dhcp.inc +++ b/meta/recipes-connectivity/dhcp/dhcp.inc @@ -51,13 +51,15 @@ do_install_append () { mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/ fi install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script + + install -d ${D}${localstatedir}/lib/dhcp/ } PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" FILES_${PN} = "" -FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" +FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${localstatedir}/lib/dhcp/" RRECOMMENDS_dhcp-server = "dhcp-server-config" FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" @@ -68,3 +70,8 @@ FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${ RDEPENDS_dhcp-client = "bash" FILES_dhcp-omshell = "${bindir}/omshell" + +pkg_postinst_dhcp-server() { + touch $D/${localstatedir}/lib/dhcp/dhcpd.leases + touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases +} diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb index 8ed7d76..2471d61 100644 --- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb +++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb @@ -1,6 +1,6 @@ require dhcp.inc -PR = "r3" +PR = "r4" SRC_URI += "file://fixincludes.patch \ file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \