diff options
author | Roy Li <rongqing.li@windriver.com> | 2015-07-16 11:14:26 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-07-16 13:27:02 -0400 |
commit | c12b9596afd236116b25ce26dbe0d793de9dc7ce (patch) | |
tree | 1901a31ee27cafc7c53768ed86521d7d38436495 /meta-networking/recipes-connectivity | |
parent | 21a4ebcbc172c25008ab855c82d13ac918caa18a (diff) | |
download | meta-openembedded-c12b9596afd236116b25ce26dbe0d793de9dc7ce.tar.gz |
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>
Diffstat (limited to 'meta-networking/recipes-connectivity')
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 | |||
14 | group = root | 14 | group = root |
15 | log_on_success += USERID | 15 | log_on_success += USERID |
16 | log_on_failure += USERID | 16 | log_on_failure += USERID |
17 | server = /usr/bin/tcpd | 17 | server = @SBINDIR@/tcpd |
18 | server_args = /usr/sbin/in.rexecd | 18 | server_args = @SBINDIR@/in.rexecd |
19 | disable = yes | 19 | disable = yes |
20 | } | 20 | } |
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 | |||
14 | group = root | 14 | group = root |
15 | log_on_success += USERID | 15 | log_on_success += USERID |
16 | log_on_failure += USERID | 16 | log_on_failure += USERID |
17 | server = /usr/bin/tcpd | 17 | server = @SBINDIR@/tcpd |
18 | server_args = /usr/sbin/in.rlogind -a | 18 | server_args = @SBINDIR@/in.rlogind -a |
19 | disable = yes | 19 | disable = yes |
20 | } | 20 | } |
21 | 21 | ||
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 | |||
15 | group = root | 15 | group = root |
16 | log_on_success += USERID | 16 | log_on_success += USERID |
17 | log_on_failure += USERID | 17 | log_on_failure += USERID |
18 | server = /usr/bin/tcpd | 18 | server = @SBINDIR@/tcpd |
19 | server_args = /usr/sbin/in.rshd -aL | 19 | server_args = @SBINDIR@/in.rshd -aL |
20 | disable = yes | 20 | disable = yes |
21 | } | 21 | } |
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 | |||
8 | socket_type = stream | 8 | socket_type = stream |
9 | wait = no | 9 | wait = no |
10 | user = root | 10 | user = root |
11 | server = /usr/sbin/in.telnetd | 11 | server = @SBINDIR@/in.telnetd |
12 | log_on_failure += USERID | 12 | log_on_failure += USERID |
13 | } | 13 | } |
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 | |||
13 | wait = yes | 13 | wait = yes |
14 | user = root | 14 | user = root |
15 | group = root | 15 | group = root |
16 | server = /usr/sbin/in.tftpd | 16 | server = @SBINDIR@/in.tftpd |
17 | server_args = /tftpboot | 17 | server_args = /tftpboot |
18 | } | 18 | } |
19 | 19 | ||
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 () { | |||
68 | cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh | 68 | cp ${WORKDIR}/rsh.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/rsh |
69 | cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet | 69 | cp ${WORKDIR}/telnet.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/telnet |
70 | cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd | 70 | cp ${WORKDIR}/tftpd.xinetd.inetutils ${D}/${sysconfdir}/xinetd.d/tftpd |
71 | |||
72 | sed -e 's,@SBINDIR@,${sbindir},g' -i ${D}/${sysconfdir}/xinetd.d/* | ||
73 | |||
71 | rm -rf ${D}${libexecdir}/ | 74 | rm -rf ${D}${libexecdir}/ |
72 | # remove usr/lib if empty | 75 | # remove usr/lib if empty |
73 | rmdir ${D}${libdir} | 76 | rmdir ${D}${libdir} |