Re: [PATCH][meta-networking][v2] ypbind-mt: add status command for initscript

[Rongqing Li <rongqing.li@windriver.com>]

Could we drop the first version of this patch from master-next,
{[a314ab41a] ypbind-yocto.init: add status command}


and accept this one

thanks

-Roy

On 2015年08月13日 08:38, rongqing.li@windriver.com wrote:
> From: Zhu Yanjun <yanjun.zhu@windriver.com>
>
> Add the "status" command in initscript to check the status of ypbind.
> remove ypbind-yocto.init as ypbind.init, which is the initscript, make
> its name similar to other recipes
>
> Signed-off-by: Zhu Yanjun <yanjun.zhu@windriver.com>
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
>   .../recipes-support/nis/files/{ypbind-yocto.init => ypbind.init}   | 7 +++++++
>   meta-networking/recipes-support/nis/ypbind-mt_1.38.bb              | 4 ++--
>   meta-networking/recipes-support/nis/ypbind-mt_2.2.bb               | 4 ++--
>   3 files changed, 11 insertions(+), 4 deletions(-)
>   rename meta-networking/recipes-support/nis/files/{ypbind-yocto.init => ypbind.init} (96%)
>
> diff --git a/meta-networking/recipes-support/nis/files/ypbind-yocto.init b/meta-networking/recipes-support/nis/files/ypbind.init
> similarity index 96%
> rename from meta-networking/recipes-support/nis/files/ypbind-yocto.init
> rename to meta-networking/recipes-support/nis/files/ypbind.init
> index 2c50d12..244dc78 100644
> --- a/meta-networking/recipes-support/nis/files/ypbind-yocto.init
> +++ b/meta-networking/recipes-support/nis/files/ypbind.init
> @@ -21,6 +21,9 @@
>   #	the NIS binding information.
>   ### END INIT INFO
>
> +# Need to use status function
> +. /etc/init.d/functions
> +
>   YPBIND_BIN=/usr/sbin/ypbind
>   pidfile=/var/run/ypbind.pid
>
> @@ -92,6 +95,10 @@ case "$1" in
>   	echo -n "Reload service ypbind"
>   	start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile
>   	;;
> +    status)
> +	echo -n "Checking for ypbind: "
> +	status $YPBIND_BIN
> +	;;
>       *)
>   	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
>   	exit 1
> 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 d25ef5c..5702cd6 100644
> --- a/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
> +++ b/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb
> @@ -26,7 +26,7 @@ DEPENDS = " \
>   PROVIDES += "ypbind"
>
>   SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
> -           file://ypbind-yocto.init \
> +           file://ypbind.init \
>              file://ypbind.service \
>   "
>   SRC_URI[md5sum] = "094088c0e282fa7f3b3dd6cc51d0a4e1"
> @@ -44,7 +44,7 @@ do_install_append () {
>       install -d ${D}${sysconfdir}/init.d
>       install -d ${D}${sysconfdir}/rcS.d
>
> -    install -m 0755 ${WORKDIR}/ypbind-yocto.init ${D}${sysconfdir}/init.d/ypbind
> +    install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind
>
>       install -d ${D}${systemd_unitdir}/system
>       install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
> diff --git a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
> index 6a9262a..cee5880 100644
> --- a/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
> +++ b/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb
> @@ -21,7 +21,7 @@ PROVIDES += "ypbind"
>   PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools"
>
>   SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \
> -           file://ypbind-yocto.init \
> +           file://ypbind.init \
>              file://ypbind.service \
>   "
>   SRC_URI[md5sum] = "54e2040d8266ae7d302d081ca310c8a8"
> @@ -41,7 +41,7 @@ do_install_append () {
>       install -d ${D}${sysconfdir}/init.d
>       install -d ${D}${sysconfdir}/rcS.d
>
> -    install -m 0755 ${WORKDIR}/ypbind-yocto.init ${D}${sysconfdir}/init.d/ypbind
> +    install -m 0755 ${WORKDIR}/ypbind.init ${D}${sysconfdir}/init.d/ypbind
>
>       install -d ${D}${systemd_unitdir}/system
>       install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
>

-- 
Best Reagrds,
Roy | RongQing Li