rpcbind: remove rpcbind.socket

We want rpcbind to start earlier than sockets.target.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
index 9cdade4959e0973bd763f0049cd6d8cbe0315cfc..1a7aafb8e51f65e082b36afc31f6e724a3663d42 100644 (file)
--- a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
+++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=RPC Bind Service
-Requires=rpcbind.socket
 
 [Service]
 Type=forking
@@ -9,4 +8,3 @@ ExecStart=@SBINDIR@/rpcbind $RPCBIND_OPTS
 SuccessExitStatus=2
 
 [Install]
-Also=rpcbind.socket

diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket
deleted file mode 100644 (file)
index d63c1d9..0000000
--- a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPCbind Server Activation Socket
-
-[Socket]
-ListenStream=/var/run/rpcbind.sock
-
-[Install]
-WantedBy=sockets.target

diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
index c19a1976a1bdaeafafdaf0b341098423d95606b7..227c31cafa95e0d8b76efcee91ff260f8e3f6b4b 100644 (file)
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
@@ -18,7 +18,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
            ${UCLIBCPATCHES} \
            ${MUSLPATCHES} \
            file://rpcbind.conf \
-           file://rpcbind.socket \
            file://rpcbind.service \
            file://cve-2015-7236.patch \
           "
@@ -65,7 +64,6 @@ do_install_append () {
 
        install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}
        install -d ${D}${systemd_unitdir}/system
-       install -m 0644 ${WORKDIR}/rpcbind.socket ${D}${systemd_unitdir}/system
        install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system
        sed -i -e 's,@SBINDIR@,${sbindir},g' \
                -e 's,@SYSCONFDIR@,${sysconfdir},g' \