dhcp: add dhclient.service

PATCH Superseded Chen Qi 1 participant 3 messages Dec 17, 2014

lore

Share & tools

lore

Chen Qi

author

2014-12-17 03:03 UTC #0 lore raw

cover dhcp: add dhclient.service

The following changes since commit 68ddb28a68ceb59cd1ed322c16143827ce1ac712:

distrodata_class: checkpkg make usage of latest_versionstring methods in bitbake fetcher (2014-11-28 13:59:52 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/systemd-dhclient
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-dhclient

Chen Qi (1):
dhcp: add dhclient.service

 meta/recipes-connectivity/dhcp/dhcp.inc               | 11 ++++++++---
 meta/recipes-connectivity/dhcp/files/dhclient.service | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.service

Signature · 1 line

1.9.1

Chen Qi

author

2014-12-17 03:03 UTC #1 lore raw

PATCH 1/1 dhcp: add dhclient.service

Add dhclient.service. This service file mainly comes from meta-systemd, with a few modifications.

Signed-off-by Chen Qi <[email protected]>

---
 meta/recipes-connectivity/dhcp/dhcp.inc               | 11 ++++++++---
 meta/recipes-connectivity/dhcp/files/dhclient.service | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.service

meta/recipes-connectivity/dhcp/dhcp.inc +8 -3

index 4949e02..b975d40 100644
@@ -17,17 +17,20 @@ SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
            file://init-relay file://default-relay \
            file://init-server file://default-server \
            file://dhclient.conf file://dhcpd.conf \
-           file://dhcpd.service file://dhcrelay.service"
+           file://dhcpd.service file://dhcrelay.service file://dhclient.service"
 
 inherit autotools systemd
 
-SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay"
+SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay ${PN}-client"
 SYSTEMD_SERVICE_${PN}-server = "dhcpd.service"
 SYSTEMD_AUTO_ENABLE_${PN}-server = "disable"
 
 SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service"
 SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable"
 
+SYSTEMD_SERVICE_${PN}-client = "dhclient.service"
+SYSTEMD_AUTO_ENABLE_${PN}-client = "disable"
+
 TARGET_CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
                 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \

@@ -64,8 +67,10 @@ do_install_append () {
 	install -d ${D}${systemd_unitdir}/system
 	install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system
 	install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system
 	sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/dhcpd.service ${D}${systemd_unitdir}/system/dhcrelay.service
-	sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd.service
+	sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/dhcpd.service ${D}${systemd_unitdir}/system/dhclient.service
+	sed -i -e 's,@BASE_SBINDIR@,${base_sbindir},g' ${D}${systemd_unitdir}/system/dhclient.service
 }
 
 PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"

meta/recipes-connectivity/dhcp/files/dhclient.service new file +15 -0

new file mode 100644
index 0000000..d3d9785
@@ -0,0 +1,15 @@
+[Unit]
+Description=Dynamic Host Configuration Protocol (DHCP)
+Wants=network.target
+Before=network.target
+After=systemd-udevd.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/dhclient.pid
+EnvironmentFile=-@SYSCONFDIR@/default/dhcp-client
+ExecStart=@BASE_SBINDIR@/dhclient -cf @SYSCONFDIR@/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $INTERFACES
+
+[Install]
+WantedBy=multi-user.target
+

Signature · 1 line

1.9.1

ChenQi

author

2014-12-17 07:22 UTC #2 lore raw

In reply to Chen Qi

Please ignore this one.
This one doesn't take nfs boot into consideration.

V2 will be sent.

Regards,
Chen Qi

Quoted 17 lines · Chen Qi

The following changes since commit 68ddb28a68ceb59cd1ed322c16143827ce1ac712:
distrodata_class: checkpkg make usage of latest_versionstring methods in bitbake fetcher (2014-11-28 13:59:52 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/systemd-dhclient
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-dhclient
Chen Qi (1):
dhcp: add dhclient.service
  meta/recipes-connectivity/dhcp/dhcp.inc               | 11 ++++++++---
  meta/recipes-connectivity/dhcp/files/dhclient.service | 15 +++++++++++++++
  2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-connectivity/dhcp/files/dhclient.service