From 8ae8b41f9d448a35441fa92f657e5b9edbcf68b5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 4 Nov 2011 20:34:15 +0000 Subject: dhcp: generate initial leases files for server 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 1cc529dd8..f9d80e783 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 8ed7d7612..2471d6104 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 \ -- cgit v1.2.3