Patchwork [RFC] dhcp: package /var/lib/dhcp with dhcp-client rather than dhcp-server

login
mail settings
Submitter Steve Sakoman
Date Jan. 6, 2012, 11:52 p.m.
Message ID <CAGDS+nk4Dj_-VLNafu+-j4s9yYs=6LVwGO0re9NyyuK4Y159Sw@mail.gmail.com>
Download mbox | patch
Permalink /patch/18715/
State New
Headers show

Comments

Steve Sakoman - Jan. 6, 2012, 11:52 p.m.
Otherwise dhclient encounters errors of this type:

dhclient: can't create
/var/lib/dhcp/dhclient-c0c60402-0bc5-4bd7-bc3b-49a27fa37d72-eth1.lease:
No such file or directory

Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

Patch

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc
b/meta/recipes-connectivity/dhcp/dhcp.inc
index f9d80e7..be256ce 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -59,14 +59,14 @@  PACKAGES += "dhcp-server dhcp-server-config
dhcp-client dhcp-relay dhcp-omshell"

 FILES_${PN} = ""

-FILES_dhcp-server = "${sbindir}/dhcpd
${sysconfdir}/init.d/dhcp-server ${localstatedir}/lib/dhcp/"
+FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
 RRECOMMENDS_dhcp-server = "dhcp-server-config"

 FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server
${sysconfdir}/dhcp/dhcpd.conf"

 FILES_dhcp-relay = "${sbindir}/dhcrelay
${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"

-FILES_dhcp-client = "${base_sbindir}/dhclient
${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
+FILES_dhcp-client = "${base_sbindir}/dhclient
${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf
${localstatedir}/lib/dhcp/"
 RDEPENDS_dhcp-client = "bash"

 FILES_dhcp-omshell = "${bindir}/omshell"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 2471d61..a3a560b 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 = "r4"
+PR = "r5"

 SRC_URI += "file://fixincludes.patch \
             file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \