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@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>

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 80aed36ff..30e81ef45 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 00dbf935b..21b55da9a 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 ad59b6207..2b894a74b 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 2a2a12e3a..2d9a0408c 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 f54916339..67b44c43e 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 9bb9fe80e..dd69da4f0 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,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/*
+
     rm -rf ${D}${libexecdir}/
     # remove usr/lib if empty
     rmdir ${D}${libdir}