port over more init scripts

SVN-Revision: 4918

diff --git a/admin/monit/files/monit.init b/admin/monit/files/monit.init
index 50b18de149597aa65ca97ad6e74113c05fa9e995..11eb303129ff810018b23dac6bf1e73a87a3c722 100644 (file)
--- a/admin/monit/files/monit.init
+++ b/admin/monit/files/monit.init
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
 BIN=monit
 DEFAULT=/etc/default/$BIN
@@ -6,20 +7,12 @@ RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
 [ -f $DEFAULT ] && . $DEFAULT
 
-case $1 in
- start)
-  mkdir -p $RUN_D
-  $BIN $OPTIONS
-  ;;
- stop)
-  [ -f $PID_F ] && kill $(cat $PID_F)
-  ;;
- restart)
-  $0 stop
-  $0 start
-  ;;
- *)
-  echo "usage: $0 (start|stop|restart)"
-  exit 1
-esac
-exit $?
+start() {
+       mkdir -p $RUN_D
+       $BIN $OPTIONS
+}
+
+stop() {
+       [ -f $PID_F ] && kill $(cat $PID_F)
+}
+

diff --git a/admin/osiris/files/osirisd.init b/admin/osiris/files/osirisd.init
index 75904e34995df0b764b4eb74d2acd3431e0fdbe2..0fc6e76c18fe61329bf4dbd4af7d7e856711a8df 100644 (file)
--- a/admin/osiris/files/osirisd.init
+++ b/admin/osiris/files/osirisd.init
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
 BIN=osirisd
 DEFAULT=/etc/default/$BIN
@@ -7,17 +8,12 @@ RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
 [ -f $DEFAULT ] && . $DEFAULT
 
-case $1 in
- start)
-  mkdir -p $LIB_D
-  mkdir -p $RUN_D
-  $BIN $OPTIONS
-  ;;
- stop)
-  [ -f $PID_F ] && kill $(cat $PID_F)
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
-exit $?
+start() {
+       mkdir -p $LIB_D
+       mkdir -p $RUN_D
+       $BIN $OPTIONS
+}
+stop() {
+       [ -f $PID_F ] && kill $(cat $PID_F)
+}
+

diff --git a/admin/syslog-ng/files/syslog-ng.init b/admin/syslog-ng/files/syslog-ng.init
index 40472ed3b990361ce48e6c680a8837c73815293b..238c1172681848fe48e9efd73696ed05e310589f 100755 (executable)
--- a/admin/syslog-ng/files/syslog-ng.init
+++ b/admin/syslog-ng/files/syslog-ng.init
@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
-syslog_start() {
+start() {
   [ -f /etc/syslog-ng/syslog-ng.conf ] || {
     echo "/etc/syslog-ng/syslog-ng.conf does not exist !";
     exit 0;
@@ -9,26 +10,17 @@ syslog_start() {
   [ -x /usr/sbin/syslog-ng ] && /usr/sbin/syslog-ng
 }
 
-syslog_stop() {
+stop() {
   killall syslog-ng
 }
 
-case "$1" in
-  start)
-       syslog_start
-       ;;
-  stop)
-       syslog_stop
-       ;;
-  restart)
-       syslog_stop
-       sleep 1s
-       syslog_start
-       ;;
-  reload)
+restart() {
+       stop
+       sleep 1
+       start
+}
+
+reload() {
        kill -HUP `cat /var/run/syslog-ng.pid` &>/dev/null
-       ;;
-  *)
-       echo "Usage: $0 <start|stop|restart|reload>"
-       ;;
-esac
+}
+

diff --git a/ipv6/mrd6/files/mrd6.init b/ipv6/mrd6/files/mrd6.init
index 886723f15e9ebbf163fe7d2ef8517b4e3da336ca..9d6519949fa94b720d0dcea304598cbcedca3e2e 100755 (executable)
--- a/ipv6/mrd6/files/mrd6.init
+++ b/ipv6/mrd6/files/mrd6.init
@@ -1,29 +1,21 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
-case $1 in
-start)
-        /sbin/lsmod | grep ipv6 > /dev/null
-        if [ "$?" != "0" ]
-        then
-          echo -n "IPv6 stack required by mrd6. Loading ipv6 module: "
-          /sbin/insmod ipv6
-          echo "Done."
-        fi
-        echo -n "Starting IPv6 multicast router (mrd6): "
+start() {
+       /sbin/lsmod | grep ipv6 > /dev/null
+       if [ "$?" != "0" ]; then
+               echo -n "IPv6 stack required by mrd6. Loading ipv6 module: "
+               /sbin/insmod ipv6
+               echo "Done."
+       fi
+       echo -n "Starting IPv6 multicast router (mrd6): "
        /usr/sbin/mrd6 -f /etc/mrd6.conf -D
-        echo "Done."
-        ;;
-stop)
-        echo -n "Stopping IPv6 multicast router (mrd6): "
+       echo "Done."
+}
+
+stop() {
+       echo -n "Stopping IPv6 multicast router (mrd6): "
        killall mrd6
-        echo "Done."
-        ;;
-restart)
-        $0 stop
-        $0 start
-        ;;
-*)
-        echo "Usage: $0 {start | stop | restart}"
-        ;;
-esac
-exit 0
+       echo "Done."
+}
+

diff --git a/libs/howl/files/mDNSResponder.init b/libs/howl/files/mDNSResponder.init
index a3a575781e83625f7dfd9763b2a18a77b81bd457..aae87c32de38dfbcc1c491e877b9d38a5f5a360f 100644 (file)
--- a/libs/howl/files/mDNSResponder.init
+++ b/libs/howl/files/mDNSResponder.init
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
 DEFAULT=/etc/default/mDNSResponder
 RUN_D=/var/run

diff --git a/libs/net-snmp/files/snmpd.init b/libs/net-snmp/files/snmpd.init
index 46b429760bf6da2be90ead40af74dafd8b4fbff6..42af3f7aa3b4fe3f6a44371402bc26608ada27ab 100644 (file)
--- a/libs/net-snmp/files/snmpd.init
+++ b/libs/net-snmp/files/snmpd.init
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
 DEFAULT=/etc/default/snmpd
 LIB_D=/var/lib/snmp
@@ -8,18 +9,14 @@ PID_F=$RUN_D/snmpd.pid
 
 [ -f $DEFAULT ] && . $DEFAULT
 
-case $1 in
- start)
-  [ -d $LIB_D ] || mkdir -p $LIB_D
-  [ -d $LOG_D ] || mkdir -p $LOG_D
-  [ -d $RUN_D ] || mkdir -p $RUN_D
-  snmpd $OPTIONS
-  ;;
- stop)
-  [ -f $PID_F ] && kill $(cat $PID_F)
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
-exit $?
+start() {
+       [ -d $LIB_D ] || mkdir -p $LIB_D
+       [ -d $LOG_D ] || mkdir -p $LOG_D
+       [ -d $RUN_D ] || mkdir -p $RUN_D
+       snmpd $OPTIONS
+}
+
+stop() {
+       [ -f $PID_F ] && kill $(cat $PID_F)
+}
+

diff --git a/multimedia/peercast/files/peercast.init b/multimedia/peercast/files/peercast.init
index c61c31438d2a458c89502ed30a76f61e88a35fce..efe47ad4609d86e77cb19db0f6a8fce83861a182 100644 (file)
--- a/multimedia/peercast/files/peercast.init
+++ b/multimedia/peercast/files/peercast.init
@@ -1,18 +1,13 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
 PID_F=/var/run/peercast.pid
 
-case $1 in
- start)
-  peercast -d -i /etc/peercast.ini -l /var/log/peercast.log -p $PID_F
-  ;;
- stop)
-  [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
+start() {
+       peercast -d -i /etc/peercast.ini -l /var/log/peercast.log -p $PID_F
+}
 
-exit $?
+stop() {
+       [ -f $PID_F ] && kill $(cat $PID_F) >/dev/null 2>&1
+}
 

diff --git a/sound/mt-daapd/files/mt-daapd.init b/sound/mt-daapd/files/mt-daapd.init
index 2968769c782ba9bcc392bf7a61f03da271800f29..344621a41ae3545451b691d555f4c43f0e8d9652 100644 (file)
--- a/sound/mt-daapd/files/mt-daapd.init
+++ b/sound/mt-daapd/files/mt-daapd.init
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
 BIN=mt-daapd
 DEFAULT=/etc/default/$BIN
@@ -6,17 +7,12 @@ RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
 [ -f $DEFAULT ] && . $DEFAULT
 
-case $1 in
- start)
-  [ -d $RUN_D ] || mkdir -p $RUN_D
-  $BIN $OPTIONS
-  ;;
- stop)
-  [ -f $PID_F ] && kill -INT $(cat $PID_F)
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
+start() {
+       [ -d $RUN_D ] || mkdir -p $RUN_D
+       $BIN $OPTIONS
+}
+
+stop() {
+       [ -f $PID_F ] && kill -INT $(cat $PID_F)
+}
 
-exit $?

diff --git a/utils/rrdcollect/files/rrdcollect.init b/utils/rrdcollect/files/rrdcollect.init
index f9ee8bcaabd3b5579bc188d48e4c5eee11226ea9..8fa4521cb5ef3af273385939eba517c1d0c516d8 100644 (file)
--- a/utils/rrdcollect/files/rrdcollect.init
+++ b/utils/rrdcollect/files/rrdcollect.init
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
 BIN=rrdcollect
 DEFAULT=/etc/default/$BIN
@@ -11,21 +12,16 @@ RRD_D=$LIB_D/rrd
 RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null)
 [ -f $DEFAULT ] && . $DEFAULT
 
-case $1 in
- start)
-  mkdir -p $RUN_D
-  mkdir -p $IMG_D
-  mkdir -p $RRD_D
-  [ -n "$RRD_F" ] || /usr/bin/rrd.sh init
-  [ -x $CGI_S ] || /usr/bin/rrd.sh cgi
-  $BIN $OPTIONS
-  ;;
- stop)
-  [ -f $PID_F ] && kill $(cat $PID_F)
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
+start() {
+       mkdir -p $RUN_D
+       mkdir -p $IMG_D
+       mkdir -p $RRD_D
+       [ -n "$RRD_F" ] || /usr/bin/rrd.sh init
+       [ -x $CGI_S ] || /usr/bin/rrd.sh cgi
+       $BIN $OPTIONS
+}
+
+stop() {
+       [ -f $PID_F ] && kill $(cat $PID_F)
+}
 
-exit $?

diff --git a/utils/setserial/files/serial.init b/utils/setserial/files/serial.init
index ffd729e1e7bab8280cb91ccfe11f60b84680f1f5..77caae3a6dfbdcf47716e0b68d2acf5e9f31e9e4 100644 (file)
--- a/utils/setserial/files/serial.init
+++ b/utils/setserial/files/serial.init
@@ -1,2 +1,6 @@
-#!/bin/sh
-/usr/sbin/setserial /dev/tts/1 irq 3
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+start() {
+       /usr/sbin/setserial /dev/tts/1 irq 3
+}