Package nfs-utils: Start/stop daemons consistently

Use tabs everywhere still we don't have an official policy.

Signed-off-by Maxime Hadjinlian <[email protected]>

From: universe II <[email protected]>

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 <[email protected]>

[Maxime:
- Make it really consistent to stop the daemons as pointed out by Yann E. Morin

- Remove the -9]

Signed-off-by Maxime Hadjinlian <[email protected]>

---
 package/nfs-utils/S60nfs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

package/nfs-utils/S60nfs +5 -5

index 7a49c79..2d4e082 100755
@@ -45,22 +45,22 @@ start() {
 stop() {
 	# Stop daemons.
 	printf "Shutting down NFS mountd: "
-	killall -q rpc.mountd
+	killall -q rpc.mountd 2>/dev/null
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
 	printf "Shutting down NFS daemon: "
-	kill -9 `pidof nfsd` 2>/dev/null
+	killall -q 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
+	killall -q rpc.statd 2>/dev/null
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	rm -f /var/lock/subsys/nfs
+	rm -f /var/run/rpc.statd.pid
 	rm -f /var/lock/subsys/nfslock
 }
 

Hello,

Title should be:

package/nfs-utils: start/stop daemons consistently

Quoted 1 line · Maxime Hadjinlian

From: universe II <[email protected]>

Please fix this "From" to be consistent with the Signed-off-by. I forgot about it when applying the previous patches from Andreas.

Quoted 1 line

Changed init script to start and stop all nfs daemons

Please use the present "Change" and not the past "Changed". I don't understand why people use the past tense in commit logs.

Quoted 7 lines

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 <[email protected]>

[Maxime:
- Make it really consistent to stop the daemons as pointed out by Yann E. Morin

Line too long, no? :)

Quoted 39 lines

- Remove the -9]

Signed-off-by Maxime Hadjinlian <[email protected]>

---
  package/nfs-utils/S60nfs | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

package/nfs-utils/S60nfs +5 -5

index 7a49c79..2d4e082 100755
@@ -45,22 +45,22 @@ start() {
  stop() {
  	# Stop daemons.
  	printf "Shutting down NFS mountd: "
-	killall -q rpc.mountd
+	killall -q rpc.mountd 2>/dev/null
  	[ $? = 0 ] && echo "OK" || echo "FAIL"
 
  	printf "Shutting down NFS daemon: "
-	kill -9 `pidof nfsd` 2>/dev/null
+	killall -q 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
+	killall -q rpc.statd 2>/dev/null
  	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	rm -f /var/lock/subsys/nfs
+	rm -f /var/run/rpc.statd.pid
  	rm -f /var/lock/subsys/nfslock
  }
 

package/nfs-utils/S60nfs case "$1" in · line 87

Quoted 8 lines

package/nfs-utils/S60nfs +1 -1

@@ -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
 

Thomas

From: universe II <[email protected]>

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 <[email protected]>

[Maxime:
- Make it really consistent to stop the daemons as pointed out by Yann E. Morin
- Remove the -9]

Signed-off-by Maxime Hadjinlian <[email protected]>

---
 package/nfs-utils/S60nfs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)