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>
This commit is contained in:
Roy Li
2015-07-16 11:14:26 +08:00
committed by Joe MacDonald
parent 21a4ebcbc1
commit c12b9596af
6 changed files with 11 additions and 8 deletions
@@ -14,7 +14,7 @@ service exec
group = root group = root
log_on_success += USERID log_on_success += USERID
log_on_failure += USERID log_on_failure += USERID
server = /usr/bin/tcpd server = @SBINDIR@/tcpd
server_args = /usr/sbin/in.rexecd server_args = @SBINDIR@/in.rexecd
disable = yes disable = yes
} }
@@ -14,8 +14,8 @@ service login
group = root group = root
log_on_success += USERID log_on_success += USERID
log_on_failure += USERID log_on_failure += USERID
server = /usr/bin/tcpd server = @SBINDIR@/tcpd
server_args = /usr/sbin/in.rlogind -a server_args = @SBINDIR@/in.rlogind -a
disable = yes disable = yes
} }
@@ -15,7 +15,7 @@ service shell
group = root group = root
log_on_success += USERID log_on_success += USERID
log_on_failure += USERID log_on_failure += USERID
server = /usr/bin/tcpd server = @SBINDIR@/tcpd
server_args = /usr/sbin/in.rshd -aL server_args = @SBINDIR@/in.rshd -aL
disable = yes disable = yes
} }
@@ -8,6 +8,6 @@ service telnet
socket_type = stream socket_type = stream
wait = no wait = no
user = root user = root
server = /usr/sbin/in.telnetd server = @SBINDIR@/in.telnetd
log_on_failure += USERID log_on_failure += USERID
} }
@@ -13,7 +13,7 @@ service tftp
wait = yes wait = yes
user = root user = root
group = root group = root
server = /usr/sbin/in.tftpd server = @SBINDIR@/in.tftpd
server_args = /tftpboot server_args = /tftpboot
} }
@@ -68,6 +68,9 @@ do_install_append () {
cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh
cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet
cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd 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}/ rm -rf ${D}${libexecdir}/
# remove usr/lib if empty # remove usr/lib if empty
rmdir ${D}${libdir} rmdir ${D}${libdir}