Patchwork [CONSOLIDATED,PULL,7/9] dhcp: generate initial leases files for server

login
mail settings
Submitter Saul Wold
Date Nov. 11, 2011, 8:36 a.m.
Message ID <fc1facb090dba0065f13dcf704ba764e29372e4f.1321000451.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/14801/
State New
Headers show

Comments

Saul Wold - Nov. 11, 2011, 8:36 a.m.
From: Otavio Salvador <otavio@ossystems.com.br>

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-connectivity/dhcp/dhcp.inc      |    9 ++++++++-
 meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
Paul Eggleton - Nov. 11, 2011, 9:33 a.m.
On Friday 11 November 2011 00:36:33 Saul Wold wrote:
> From: Otavio Salvador <otavio@ossystems.com.br>
> 
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Can we please get commit messages for every commit? Every change needs to have 
something so that if some time in the future we want to go back and figure out 
*why* a change was made, we can do so.

Thanks,
Paul
Paul Menzel - Nov. 11, 2011, 9:37 a.m.
Am Freitag, den 11.11.2011, 09:33 +0000 schrieb Paul Eggleton:
> On Friday 11 November 2011 00:36:33 Saul Wold wrote:
> > From: Otavio Salvador <otavio@ossystems.com.br>
> > 
> > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> 
> Can we please get commit messages for every commit? Every change needs to have 
> something so that if some time in the future we want to go back and figure out 
> *why* a change was made, we can do so.

Great that I am not alone. See my response to the introductory message.

Although for this patch, Otavio wrote a kind of commit message in his
response to my response.


Thanks,

Paul

Patch

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 \