[Buildroot] [PATCH 1/2] Package nfs-utils: Added check for OK/FAIL

[Buildroot] [PATCH 1/2] Package nfs-utils: Added check for OK/FAIL

[Andreas Ehmanns]

Removed unconditional 'done' output when starting
and stopping the daemons. Instead check return value
of daemon and print out OK or FAIL.

Signed-off-by: Andreas Ehmanns <universeII@gmx.de>
---
 package/nfs-utils/S60nfs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/package/nfs-utils/S60nfs b/package/nfs-utils/S60nfs
index 5639b8f..0b78c9b 100755
--- a/package/nfs-utils/S60nfs
+++ b/package/nfs-utils/S60nfs
@@ -25,20 +25,20 @@ start() {
 	# Start daemons.
 	printf "Starting NFS statd: "
 	rpc.statd
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
 	touch /var/lock/subsys/nfslock
-	echo "done"
-
+	
 	printf "Starting NFS services: "
 	/usr/sbin/exportfs -r
-	echo "done"
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Starting NFS daemon: "
 	rpc.nfsd ${NR_THREADS}
-	echo "done"
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Starting NFS mountd: "
 	rpc.mountd
-	echo "done"
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
 	touch /var/lock/subsys/nfs
 }
 
@@ -46,21 +46,21 @@ stop() {
 	# Stop daemons.
 	printf "Shutting down NFS mountd: "
 	killall -q rpc.mountd
-	echo "done"
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Shutting down NFS daemon: "
 	kill -9 `pidof nfsd` 2>/dev/null
-	echo "done"
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Shutting down NFS services: "
 	/usr/sbin/exportfs -au
 	rm -f /var/lock/subsys/nfs
 	killall -q rpc.statd
-	echo "done"
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Stopping NFS statd: "
 	killall -q rpc.statd
-	echo "done"
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
 	rm -f /var/lock/subsys/nfslock
 }
 
-- 
2.1.4

[Buildroot] [PATCH 2/2] Package nfs-utils: Start/stop daemons consistently

[Andreas Ehmanns]

Changed init script to start and stop all nfs daemons
in a consistent way. Using the same kill command,
start/stop the daemon, printout OK or FAIL and touch
or deleted necessary files.

Signed-off-by: Andreas Ehmanns <universeII@gmx.de>
---
 package/nfs-utils/S60nfs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/nfs-utils/S60nfs b/package/nfs-utils/S60nfs
index 0b78c9b..c9368b4 100755
--- a/package/nfs-utils/S60nfs
+++ b/package/nfs-utils/S60nfs
@@ -27,7 +27,7 @@ start() {
 	rpc.statd
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
 	touch /var/lock/subsys/nfslock
-	
+
 	printf "Starting NFS services: "
 	/usr/sbin/exportfs -r
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
@@ -49,18 +49,18 @@ stop() {
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Shutting down NFS daemon: "
-	kill -9 `pidof nfsd` 2>/dev/null
+	killall -q -9 nfsd 2>/dev/null
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Shutting down NFS services: "
 	/usr/sbin/exportfs -au
-	rm -f /var/lock/subsys/nfs
-	killall -q rpc.statd
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Stopping NFS statd: "
 	killall -q rpc.statd
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	rm -f /var/lock/subsys/nfs
+	rm -f /var/run/rpc.statd.pid
 	rm -f /var/lock/subsys/nfslock
 }
 
@@ -81,7 +81,7 @@ case "$1" in
 	touch /var/lock/subsys/nfs
 	;;
   *)
-	echo "Usage: nfs {start|stop|reload}"
+	echo "Usage: $0 {start|stop|restart|reload}"
 	exit 1
 esac
 
-- 
2.1.4

[Buildroot] [PATCH 1/2] Package nfs-utils: Added check for OK/FAIL

[Yann E. MORIN]

Andreas, All,

On 2016-02-26 12:16 +0100, Andreas Ehmanns spake thusly:
> Removed unconditional 'done' output when starting
> and stopping the daemons. Instead check return value
> of daemon and print out OK or FAIL.
> 
> Signed-off-by: Andreas Ehmanns <universeII@gmx.de>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/nfs-utils/S60nfs | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/package/nfs-utils/S60nfs b/package/nfs-utils/S60nfs
> index 5639b8f..0b78c9b 100755
> --- a/package/nfs-utils/S60nfs
> +++ b/package/nfs-utils/S60nfs
> @@ -25,20 +25,20 @@ start() {
>  	# Start daemons.
>  	printf "Starting NFS statd: "
>  	rpc.statd
> +	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  	touch /var/lock/subsys/nfslock
> -	echo "done"
> -
> +	
>  	printf "Starting NFS services: "
>  	/usr/sbin/exportfs -r
> -	echo "done"
> +	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  
>  	printf "Starting NFS daemon: "
>  	rpc.nfsd ${NR_THREADS}
> -	echo "done"
> +	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  
>  	printf "Starting NFS mountd: "
>  	rpc.mountd
> -	echo "done"
> +	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  	touch /var/lock/subsys/nfs
>  }
>  
> @@ -46,21 +46,21 @@ stop() {
>  	# Stop daemons.
>  	printf "Shutting down NFS mountd: "
>  	killall -q rpc.mountd
> -	echo "done"
> +	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  
>  	printf "Shutting down NFS daemon: "
>  	kill -9 `pidof nfsd` 2>/dev/null
> -	echo "done"
> +	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  
>  	printf "Shutting down NFS services: "
>  	/usr/sbin/exportfs -au
>  	rm -f /var/lock/subsys/nfs
>  	killall -q rpc.statd
> -	echo "done"
> +	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  
>  	printf "Stopping NFS statd: "
>  	killall -q rpc.statd
> -	echo "done"
> +	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  	rm -f /var/lock/subsys/nfslock
>  }
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2/2] Package nfs-utils: Start/stop daemons consistently

[Yann E. MORIN]

Andreas, All,

On 2016-02-26 12:16 +0100, Andreas Ehmanns spake thusly:
> Changed init script to start and stop all nfs daemons
> in a consistent way. Using the same kill command,
> start/stop the daemon, printout OK or FAIL and touch
> or deleted necessary files.
> 
> Signed-off-by: Andreas Ehmanns <universeII@gmx.de>
> ---
>  package/nfs-utils/S60nfs | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/package/nfs-utils/S60nfs b/package/nfs-utils/S60nfs
> index 0b78c9b..c9368b4 100755
> --- a/package/nfs-utils/S60nfs
> +++ b/package/nfs-utils/S60nfs
> @@ -27,7 +27,7 @@ start() {
>  	rpc.statd
>  	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  	touch /var/lock/subsys/nfslock
> -	
> +

Hmm... I missed that spurious change in your previous patch... :-/

>  	printf "Starting NFS services: "
>  	/usr/sbin/exportfs -r
>  	[ $? = 0 ] && echo "OK" || echo "FAIL"
> @@ -49,18 +49,18 @@ stop() {
>  	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  
>  	printf "Shutting down NFS daemon: "
> -	kill -9 `pidof nfsd` 2>/dev/null
> +	killall -q -9 nfsd 2>/dev/null

Since you said "stop all nfs daemons in a consistent way", why do we
need to killall -9 here, when we're not using it for the other two
daemons?

Regards,
Yann E. MORIN.

>  	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  
>  	printf "Shutting down NFS services: "
>  	/usr/sbin/exportfs -au
> -	rm -f /var/lock/subsys/nfs
> -	killall -q rpc.statd
>  	[ $? = 0 ] && echo "OK" || echo "FAIL"
>  
>  	printf "Stopping NFS statd: "
>  	killall -q rpc.statd
>  	[ $? = 0 ] && echo "OK" || echo "FAIL"
> +	rm -f /var/lock/subsys/nfs
> +	rm -f /var/run/rpc.statd.pid
>  	rm -f /var/lock/subsys/nfslock
>  }
>  
> @@ -81,7 +81,7 @@ case "$1" in
>  	touch /var/lock/subsys/nfs
>  	;;
>    *)
> -	echo "Usage: nfs {start|stop|reload}"
> +	echo "Usage: $0 {start|stop|restart|reload}"
>  	exit 1
>  esac
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/2] Package nfs-utils: Added check for OK/FAIL

[Maxime Hadjinlian]

Andreas, all

Reviewed-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

On Fri, Jul 1, 2016 at 2:41 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Andreas, All,
>
> On 2016-02-26 12:16 +0100, Andreas Ehmanns spake thusly:
>> Removed unconditional 'done' output when starting
>> and stopping the daemons. Instead check return value
>> of daemon and print out OK or FAIL.
>>
>> Signed-off-by: Andreas Ehmanns <universeII@gmx.de>
>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Regards,
> Yann E. MORIN.
>
>> ---
>>  package/nfs-utils/S60nfs | 18 +++++++++---------
>>  1 file changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/package/nfs-utils/S60nfs b/package/nfs-utils/S60nfs
>> index 5639b8f..0b78c9b 100755
>> --- a/package/nfs-utils/S60nfs
>> +++ b/package/nfs-utils/S60nfs
>> @@ -25,20 +25,20 @@ start() {
>>       # Start daemons.
>>       printf "Starting NFS statd: "
>>       rpc.statd
>> +     [ $? = 0 ] && echo "OK" || echo "FAIL"
>>       touch /var/lock/subsys/nfslock
>> -     echo "done"
>> -
>> +
>>       printf "Starting NFS services: "
>>       /usr/sbin/exportfs -r
>> -     echo "done"
>> +     [ $? = 0 ] && echo "OK" || echo "FAIL"
>>
>>       printf "Starting NFS daemon: "
>>       rpc.nfsd ${NR_THREADS}
>> -     echo "done"
>> +     [ $? = 0 ] && echo "OK" || echo "FAIL"
>>
>>       printf "Starting NFS mountd: "
>>       rpc.mountd
>> -     echo "done"
>> +     [ $? = 0 ] && echo "OK" || echo "FAIL"
>>       touch /var/lock/subsys/nfs
>>  }
>>
>> @@ -46,21 +46,21 @@ stop() {
>>       # Stop daemons.
>>       printf "Shutting down NFS mountd: "
>>       killall -q rpc.mountd
>> -     echo "done"
>> +     [ $? = 0 ] && echo "OK" || echo "FAIL"
>>
>>       printf "Shutting down NFS daemon: "
>>       kill -9 `pidof nfsd` 2>/dev/null
>> -     echo "done"
>> +     [ $? = 0 ] && echo "OK" || echo "FAIL"
>>
>>       printf "Shutting down NFS services: "
>>       /usr/sbin/exportfs -au
>>       rm -f /var/lock/subsys/nfs
>>       killall -q rpc.statd
>> -     echo "done"
>> +     [ $? = 0 ] && echo "OK" || echo "FAIL"
>>
>>       printf "Stopping NFS statd: "
>>       killall -q rpc.statd
>> -     echo "done"
>> +     [ $? = 0 ] && echo "OK" || echo "FAIL"
>>       rm -f /var/lock/subsys/nfslock
>>  }
>>
>> --
>> 2.1.4
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/2] Package nfs-utils: Added check for OK/FAIL

[Peter Korsgaard]

>>>>> "Maxime" == Maxime Hadjinlian <maxime.hadjinlian@gmail.com> writes:

 > Andreas, all
 > Reviewed-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

 > On Fri, Jul 1, 2016 at 2:41 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
 >> Andreas, All,
 >> 
 >> On 2016-02-26 12:16 +0100, Andreas Ehmanns spake thusly:
 >>> Removed unconditional 'done' output when starting
 >>> and stopping the daemons. Instead check return value
 >>> of daemon and print out OK or FAIL.
 >>> 
 >>> Signed-off-by: Andreas Ehmanns <universeII@gmx.de>
 >> 
 >> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] Package nfs-utils: Start/stop daemons consistently

[Maxime Hadjinlian]

Hi Andreas,

Thanks a lot for your patch, since your patch is a little bit old,
Yann made some comments, I have some too. It's gonna be quicker for me
to respin your patch. Obviously you will remain as the author.

The patch will be marked as "Changes Requested" in our patchwork.

On Fri, Jul 1, 2016 at 2:46 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Andreas, All,
>
> On 2016-02-26 12:16 +0100, Andreas Ehmanns spake thusly:
>> Changed init script to start and stop all nfs daemons
>> in a consistent way. Using the same kill command,
>> start/stop the daemon, printout OK or FAIL and touch
>> or deleted necessary files.
>>
>> Signed-off-by: Andreas Ehmanns <universeII@gmx.de>
>> ---
>>  package/nfs-utils/S60nfs | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/package/nfs-utils/S60nfs b/package/nfs-utils/S60nfs
>> index 0b78c9b..c9368b4 100755
>> --- a/package/nfs-utils/S60nfs
>> +++ b/package/nfs-utils/S60nfs
>> @@ -27,7 +27,7 @@ start() {
>>       rpc.statd
>>       [ $? = 0 ] && echo "OK" || echo "FAIL"
>>       touch /var/lock/subsys/nfslock
>> -
>> +
>
> Hmm... I missed that spurious change in your previous patch... :-/
>
>>       printf "Starting NFS services: "
>>       /usr/sbin/exportfs -r
>>       [ $? = 0 ] && echo "OK" || echo "FAIL"
>> @@ -49,18 +49,18 @@ stop() {
>>       [ $? = 0 ] && echo "OK" || echo "FAIL"
>>
>>       printf "Shutting down NFS daemon: "
>> -     kill -9 `pidof nfsd` 2>/dev/null
>> +     killall -q -9 nfsd 2>/dev/null
>
> Since you said "stop all nfs daemons in a consistent way", why do we
> need to killall -9 here, when we're not using it for the other two
> daemons?
>
> Regards,
> Yann E. MORIN.
>
>>       [ $? = 0 ] && echo "OK" || echo "FAIL"
>>
>>       printf "Shutting down NFS services: "
>>       /usr/sbin/exportfs -au
>> -     rm -f /var/lock/subsys/nfs
>> -     killall -q rpc.statd
>>       [ $? = 0 ] && echo "OK" || echo "FAIL"
>>
>>       printf "Stopping NFS statd: "
>>       killall -q rpc.statd
>>       [ $? = 0 ] && echo "OK" || echo "FAIL"
>> +     rm -f /var/lock/subsys/nfs
>> +     rm -f /var/run/rpc.statd.pid
>>       rm -f /var/lock/subsys/nfslock
>>  }
>>
>> @@ -81,7 +81,7 @@ case "$1" in
>>       touch /var/lock/subsys/nfs
>>       ;;
>>    *)
>> -     echo "Usage: nfs {start|stop|reload}"
>> +     echo "Usage: $0 {start|stop|restart|reload}"
>>       exit 1
>>  esac
>>
>> --
>> 2.1.4
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
> .-----------------.--------------------.------------------.--------------------.
> |  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
> | +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot