[nas/f12/master] Make nasd.init LSB compliant

Petr Pisar ppisar at fedoraproject.org
Wed Aug 11 08:47:57 UTC 2010


commit dd5426008a35cdc136ce6cbe84f7e291dce912e5
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Aug 10 17:38:35 2010 +0200

    Make nasd.init LSB compliant

 nasd.init |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/nasd.init b/nasd.init
index 28ecdec..a98aba4 100644
--- a/nasd.init
+++ b/nasd.init
@@ -1,21 +1,29 @@
 #!/bin/bash
+#
+# nasd  Network Audio System daemon
+#
+# chkconfig: - 88 12
+# description:  nasd is sound server for Network Audio System (NAS) \
+#               that allows to forward audio stream across network.
+#
 ### BEGIN INIT INFO
 # Provides: nasd
-# Default-Start: 5
-# Default-Stop: 0 1 2 3 4 6
-# Short-Description: start the nas daemon
-# Description: Network transparent audio server
+# Should-Start: $network $syslog
+# Should-Stop: $syslog
+# Short-Description: start the NAS daemon
+# Description:  nasd is sound server for Network Audio System (NAS) \
+#               that allows to forward audio stream across network.
 ### END INIT INFO
-# Only for Fedora
-# chkconfig: 345 88 88
 
 #Servicename
 SERVICE=nasd
+LOCKFILE=/var/lock/subsys/$SERVICE
 
 #Source function library.
-. /etc/init.d/functions
+. /etc/rc.d/init.d/functions
 
-[ -f /usr/bin/$SERVICE ] || exit 0
+
+[ -f /usr/bin/$SERVICE ] || exit 5
 
 # Source config
 if [ -f /etc/sysconfig/$SERVICE ] ; then
@@ -39,7 +47,7 @@ start() {
 	daemon $SERVICE $NASD_OPTIONS
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	return $RETVAL
 }	
 stop() {
@@ -51,7 +59,7 @@ stop() {
 	killproc $SERVICE
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$SERVICE
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
 	return $RETVAL
 }
 rhstatus() {
@@ -76,11 +84,11 @@ case "$1" in
   restart|reload)
   	restart
 	;;
-  condrestart)
-  	[ -f /var/lock/subsys/$SERVICE ] && restart || :
+  condrestart|try-restart)
+  	[ -f $LOCKFILE ] && restart || :
 	;;
   *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
 	exit 1
 esac
 


More information about the scm-commits mailing list