[oe-commits] Roy Li : inetutils: fix tcpd path in xinetd configuration file

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: c12b9596afd236116b25ce26dbe0d793de9dc7ce
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c12b9596afd236116b25ce26dbe0d793de9dc7ce

Author: Roy Li <rongqing.li at windriver.com>
Date:   Thu Jul 16 11:14:26 2015 +0800

inetutils: fix tcpd path in xinetd configuration file

tcpd from tcp-wrapper is installed into /usr/sbin/, not /usr/bin/
using sed to dynamical update the path to add the robust

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>

---

 .../inetutils/inetutils-1.9.2/rexec.xinetd.inetutils                  | 4 ++--
 .../inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils                 | 4 ++--
 .../inetutils/inetutils-1.9.2/rsh.xinetd.inetutils                    | 4 ++--
 .../inetutils/inetutils-1.9.2/telnet.xinetd.inetutils                 | 2 +-
 .../inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils                  | 2 +-
 meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb     | 3 +++
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
index 80aed36..30e81ef 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rexec.xinetd.inetutils
@@ -14,7 +14,7 @@ service exec
 	group		= root
 	log_on_success	+= USERID
 	log_on_failure	+= USERID
-	server		= /usr/bin/tcpd
-	server_args	= /usr/sbin/in.rexecd
+	server		= @SBINDIR@/tcpd
+	server_args	= @SBINDIR@/in.rexecd
 	disable		= yes
 }
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
index 00dbf93..21b55da 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rlogin.xinetd.inetutils
@@ -14,8 +14,8 @@ service login
 	group		= root
 	log_on_success	+= USERID
 	log_on_failure	+= USERID
-	server		= /usr/bin/tcpd
-	server_args	= /usr/sbin/in.rlogind -a
+	server		= @SBINDIR@/tcpd
+	server_args	= @SBINDIR@/in.rlogind -a
 	disable		= yes
 }
 							
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
index ad59b62..2b894a7 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/rsh.xinetd.inetutils
@@ -15,7 +15,7 @@ service shell
 	group		= root
 	log_on_success	+= USERID
 	log_on_failure	+= USERID
-	server		= /usr/bin/tcpd
-	server_args	= /usr/sbin/in.rshd -aL
+	server		= @SBINDIR@/tcpd
+	server_args	= @SBINDIR@/in.rshd -aL
 	disable		= yes
 }
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils
index 2a2a12e..2d9a040 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnet.xinetd.inetutils
@@ -8,6 +8,6 @@ service telnet
 	socket_type	= stream
 	wait		= no
 	user		= root
-	server		= /usr/sbin/in.telnetd
+	server		= @SBINDIR@/in.telnetd
 	log_on_failure	+= USERID
 }
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils
index f549163..67b44c4 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/tftpd.xinetd.inetutils
@@ -13,7 +13,7 @@ service tftp
         wait            = yes
         user            = root
         group           = root
-        server          = /usr/sbin/in.tftpd
+        server          = @SBINDIR@/in.tftpd
         server_args     = /tftpboot
 }
 
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
index 9bb9fe8..dd69da4 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.2.bb
@@ -68,6 +68,9 @@ do_install_append () {
     cp ${WORKDIR}/rsh.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/rsh
     cp ${WORKDIR}/telnet.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/telnet
     cp ${WORKDIR}/tftpd.xinetd.inetutils  ${D}/${sysconfdir}/xinetd.d/tftpd
+
+    sed -e 's, at SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/*
+
     rm -rf ${D}${libexecdir}/
     # remove usr/lib if empty
     rmdir ${D}${libdir}