Patchwork [3/4] rpcbind: Add systemd support

login
register
mail settings
Submitter Shakeel, Muhammad
Date Aug. 1, 2013, 11:43 a.m.
Message ID <1375357402-10147-3-git-send-email-muhammad_shakeel@mentor.com>
Download mbox | patch
Permalink /patch/54903/
State New
Headers show

Comments

Shakeel, Muhammad - Aug. 1, 2013, 11:43 a.m.
From: Muhammad Shakeel <muhammad_shakeel@mentor.com>

- Remove dependency on meta-systemd

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
---
 .../rpcbind/rpcbind/rpcbind.service                |   13 +++++++++++++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb     |   10 +++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
Enrico Scholz - Aug. 1, 2013, 12:34 p.m.
"Shakeel, Muhammad"
<muhammad_shakeel-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org> writes:

> +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
> ...
> +[Service]
> +Type=forking
> +ExecStart=/usr/sbin/rpcbind

The '-w' option, perhaps '-f' (--> 'Type=forking' can be removed then)
and a general way to add local options would be a good idea.

-->

| EnvironmentFile=-/etc/default/rpcbind
| ExecStart=/sbin/rpcbind -f -w ${RPCBIND_ARGS}


Enrico

Patch

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
new file mode 100644
index 0000000..a028ace
--- /dev/null
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -0,0 +1,13 @@ 
+[Unit]
+Description=RPC Bind
+After=network.target
+Wants=rpcbind.target
+Before=rpcbind.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/rpcbind
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
index f4a0367..c73c2c7 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb
@@ -15,6 +15,7 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
            file://fix_host_path.patch \
            file://obsolete_automake_macros.patch \
            ${UCLIBCPATCHES} \
+           file://rpcbind.service \
           "
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
@@ -27,7 +28,7 @@  SRC_URI[sha256sum] = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497
 
 PR = "r4"
 
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
 
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
@@ -35,6 +36,9 @@  PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
+SYSTEMD_SERVICE_${PN} = "rpcbind.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
 do_install_append () {
     mv ${D}${bindir} ${D}${sbindir}
 
@@ -43,4 +47,8 @@  do_install_append () {
         -e 's,/sbin/,${sbindir}/,g' \
         ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
     chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
+
+    install -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
+    sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/rpcbind.service
 }