mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
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>
This commit is contained in:
parent
fb80c7f2f3
commit
b6d4390d7b
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
YPBIND_BIN=/usr/sbin/ypbind
|
||||
pidfile=/var/run/ypbind.pid
|
||||
YPDOMAINNAME_bin=/usr/bin/ypdomainname
|
||||
|
||||
[ -f /etc/default/ypbind ] && . /etc/default/ypbind
|
||||
|
||||
|
|
@ -34,14 +35,14 @@ case "$1" in
|
|||
echo -n "Starting ypbind"
|
||||
## If the domainname is not set, skip starting of ypbind
|
||||
## and return with "program not configured"
|
||||
/bin/ypdomainname >/dev/null 2>&1
|
||||
if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
|
||||
$YPDOMAINNAME_bin >/dev/null 2>&1
|
||||
if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
|
||||
if [ -f /etc/defaultdomain ]; then
|
||||
XDOMAINNAME=`cat /etc/defaultdomain`
|
||||
/bin/ypdomainname "$XDOMAINNAME"
|
||||
$YPDOMAINNAME_bin "$XDOMAINNAME"
|
||||
fi
|
||||
/bin/ypdomainname >/dev/null 2>&1
|
||||
if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
|
||||
$YPDOMAINNAME_bin >/dev/null 2>&1
|
||||
if [ $? -ne 0 -o -z "`$YPDOMAINNAME_bin 2>/dev/null`" ]; then
|
||||
# Tell the user this has skipped
|
||||
echo -n " . . . . . . . . . . No domainname set"
|
||||
# service is not configured
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ DEPENDS = " \
|
|||
yp-tools \
|
||||
${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
|
||||
"
|
||||
RDEPENDS_${PN} += "yp-tools"
|
||||
|
||||
# ypbind-mt now provides all the functionality of ypbind
|
||||
# and is used in place of it.
|
||||
PROVIDES += "ypbind"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user