Patchwork nfs-utils: modify nfsserver init script indent

login
register
mail settings
Submitter Qiang Chen
Date Oct. 22, 2013, 5:14 a.m.
Message ID <1382418861-2658-1-git-send-email-qiang.chen@windriver.com>
Download mbox | patch
Permalink /patch/60341/
State Accepted
Commit aedf3d914392df1082abdcde80880d67b34f7e77
Headers show

Comments

Qiang Chen - Oct. 22, 2013, 5:14 a.m.
From: Qiang Chen <qiang.chen@windriver.com>

Using sysvinit testing service status, nfsserver status
allways display as [?] unknown.

This is because sysvinit package check whether service's
init script supporting status function or not by:
grep -qs "\Wstatus)" "$SERVICE"

So, this commit modified the indent for status etc, as
most service's init script does.

Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
---
 .../nfs-utils/nfs-utils/nfsserver                  |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Qiang Chen - Oct. 29, 2013, 9:47 a.m.
Hi richard and Saul,

Any comment for this patch ?
If it's OK, could you please help merge to oe-core at your earliest convenience ?


Thanks a lot !
Qiang

On 10/22/2013 01:14 PM, qiang.chen@windriver.com wrote:

> From: Qiang Chen <qiang.chen@windriver.com>
>
> Using sysvinit testing service status, nfsserver status
> allways display as [?] unknown.
>
> This is because sysvinit package check whether service's
> init script supporting status function or not by:
> grep -qs "\Wstatus)" "$SERVICE"
>
> So, this commit modified the indent for status etc, as
> most service's init script does.
>
> Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
> ---
>   .../nfs-utils/nfs-utils/nfsserver                  |   12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
> index d7cf6e0..c263f14 100644
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
> @@ -144,26 +144,26 @@ stop_statd(){
>   #  restart: stops and starts mountd
>   #FIXME: need to create the /var/lib/nfs/... directories
>   case "$1" in
> -start)	create_directories
> +  start)	create_directories
>   	start_nfsd "$NFS_SERVERS"
>   	start_mountd
>   	start_statd
>   	test -r /etc/exports && exportfs -a;;
> -stop)	exportfs -ua
> +  stop)	exportfs -ua
>   	stop_statd
>   	stop_mountd
>   	stop_nfsd;;
> -status)
> +  status)
>   	status /usr/sbin/rpc.mountd
>   	RETVAL=$?
>   	status nfsd
>   	rval=$?
>   	[ $RETVAL -eq 0 ] && exit $rval
>   	exit $RETVAL;;
> -reload)	test -r /etc/exports && exportfs -r;;
> -restart)
> +  reload)	test -r /etc/exports && exportfs -r;;
> +  restart)
>   	$0 stop
>   	$0 start;;
> -*)	echo "Usage: $0 {start|stop|status|reload|restart}"
> +  *)	echo "Usage: $0 {start|stop|status|reload|restart}"
>   	exit 1;;
>   esac
>

Patch

diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
index d7cf6e0..c263f14 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfsserver
@@ -144,26 +144,26 @@  stop_statd(){
 #  restart: stops and starts mountd
 #FIXME: need to create the /var/lib/nfs/... directories
 case "$1" in
-start)	create_directories
+  start)	create_directories
 	start_nfsd "$NFS_SERVERS"
 	start_mountd
 	start_statd
 	test -r /etc/exports && exportfs -a;;
-stop)	exportfs -ua
+  stop)	exportfs -ua
 	stop_statd
 	stop_mountd
 	stop_nfsd;;
-status)
+  status)
 	status /usr/sbin/rpc.mountd
 	RETVAL=$?
 	status nfsd
 	rval=$?
 	[ $RETVAL -eq 0 ] && exit $rval
 	exit $RETVAL;;
-reload)	test -r /etc/exports && exportfs -r;;
-restart)
+  reload)	test -r /etc/exports && exportfs -r;;
+  restart)
 	$0 stop
 	$0 start;;
-*)	echo "Usage: $0 {start|stop|status|reload|restart}"
+  *)	echo "Usage: $0 {start|stop|status|reload|restart}"
 	exit 1;;
 esac