diff options
author | Jian Liu <jian.liu@windriver.com> | 2015-11-02 01:05:46 -0500 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2015-11-30 12:53:48 -0500 |
commit | b6d4390d7b9a0b7ef14879e0ddd6ea2a3114e530 (patch) | |
tree | 1d72bd5d4b5358adfc7ce2931926a0950770e0d9 /meta-networking/recipes-support/nis | |
parent | fb80c7f2f3152c521cd46c19338ec78978b7d730 (diff) | |
download | meta-openembedded-b6d4390d7b9a0b7ef14879e0ddd6ea2a3114e530.tar.gz |
ypbind-mt: set path of ypdomainname in ypbind script
The script ypbind will cause error if using ypdomainname command
provided by busybox. So add RDEPENDCY on yp-tools and change
the path of ypdomainname.
Signed-off-by: Jian Liu <jian.liu@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/nis')
-rw-r--r-- | meta-networking/recipes-support/nis/files/ypbind.init | 11 | ||||
-rw-r--r-- | meta-networking/recipes-support/nis/ypbind-mt_1.38.bb | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/meta-networking/recipes-support/nis/files/ypbind.init b/meta-networking/recipes-support/nis/files/ypbind.init index 244dc78bc..669c19ca0 100644 --- a/meta-networking/recipes-support/nis/files/ypbind.init +++ b/meta-networking/recipes-support/nis/files/ypbind.init | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | YPBIND_BIN=/usr/sbin/ypbind | 27 | YPBIND_BIN=/usr/sbin/ypbind |
28 | pidfile=/var/run/ypbind.pid | 28 | pidfile=/var/run/ypbind.pid |
29 | YPDOMAINNAME_bin=/usr/bin/ypdomainname | ||
29 | 30 | ||
30 | [ -f /etc/default/ypbind ] && . /etc/default/ypbind | 31 | [ -f /etc/default/ypbind ] && . /etc/default/ypbind |
31 | 32 | ||
@@ -34,14 +35,14 @@ case "$1" in | |||
34 | echo -n "Starting ypbind" | 35 | echo -n "Starting ypbind" |
35 | ## If the domainname is not set, skip starting of ypbind | 36 | ## If the domainname is not set, skip starting of ypbind |
36 | ## and return with "program not configured" | 37 | ## and return with "program not configured" |
37 | /bin/ypdomainname >/dev/null 2>&1 | 38 | $YPDOMAINNAME_bin >/dev/null 2>&1 |
38 | if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then | 39 | if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then |
39 | if [ -f /etc/defaultdomain ]; then | 40 | if [ -f /etc/defaultdomain ]; then |
40 | XDOMAINNAME=`cat /etc/defaultdomain` | 41 | XDOMAINNAME=`cat /etc/defaultdomain` |
41 | /bin/ypdomainname "$XDOMAINNAME" | 42 | $YPDOMAINNAME_bin "$XDOMAINNAME" |
42 | fi | 43 | fi |
43 | /bin/ypdomainname >/dev/null 2>&1 | 44 | $YPDOMAINNAME_bin >/dev/null 2>&1 |
44 | if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then | 45 | if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then |
45 | # Tell the user this has skipped | 46 | # Tell the user this has skipped |
46 | echo -n " . . . . . . . . . . No domainname set" | 47 | echo -n " . . . . . . . . . . No domainname set" |
47 | # service is not configured | 48 | # service is not configured |
diff --git a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb index 5702cd6a5..d113b82e8 100644 --- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb +++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb | |||
@@ -21,6 +21,8 @@ DEPENDS = " \ | |||
21 | yp-tools \ | 21 | yp-tools \ |
22 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 22 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
23 | " | 23 | " |
24 | RDEPENDS_${PN} += "yp-tools" | ||
25 | |||
24 | # ypbind-mt now provides all the functionality of ypbind | 26 | # ypbind-mt now provides all the functionality of ypbind |
25 | # and is used in place of it. | 27 | # and is used in place of it. |
26 | PROVIDES += "ypbind" | 28 | PROVIDES += "ypbind" |