init script cleanup, use /etc/rc.d/ for enabled scripts, /etc/init.d/<pkgname> (enabl...
authorFelix Fietkau <nbd@openwrt.org>
Sun, 15 Oct 2006 21:03:30 +0000 (21:03 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sun, 15 Oct 2006 21:03:30 +0000 (21:03 +0000)
SVN-Revision: 5128

92 files changed:
admin/monit/files/monit.init
admin/osiris/files/osirisd.init
admin/syslog-ng/Makefile
ipv6/mrd6/Makefile
lang/php4/files/php.init
libs/avahi/files/avahi-daemon.init
libs/howl/files/autoipd.init
libs/howl/files/mDNSResponder.init
libs/howl/files/nifd.init
libs/net-snmp/files/snmpd.init
multimedia/peercast/Makefile
net/aiccu/Makefile
net/asterisk/Makefile
net/asterisk/files/asterisk.init
net/bind/Makefile
net/bitchx/Makefile
net/bitchx/files/S98bitchxrc [deleted file]
net/bitchx/files/bitchxrc.init [new file with mode: 0755]
net/bitlbee/Makefile
net/bitlbee/files/S55bitlbee [deleted file]
net/bitlbee/files/bitlbee.init [new file with mode: 0755]
net/click/Makefile
net/click/files/S50roofnet [deleted file]
net/click/files/roofnet.init [new file with mode: 0755]
net/cups/Makefile
net/freeradius/files/radiusd.init
net/gmediaserver/files/gmediaserver.init
net/htpdate/Makefile
net/htpdate/files/htpdate.init
net/l2tpd/files/l2tpd.init
net/lighttpd/files/lighttpd.init
net/maradns/Makefile
net/miau/Makefile
net/miau/files/S50miau [deleted file]
net/miau/files/miau.init [new file with mode: 0755]
net/miredo/files/miredo-server.init
net/miredo/files/miredo.init
net/netperf/Makefile
net/nfs-kernel-server/Makefile
net/nfs-kernel-server/files/nfsd.init
net/nfs-server/Makefile
net/oidentd/Makefile
net/oidentd/files/S85oidentd [deleted file]
net/oidentd/files/oidentd.init [new file with mode: 0755]
net/olsrd/Makefile
net/olsrd/files/olsrd.init
net/openntpd/Makefile
net/openntpd/files/ntpd.init
net/openssh/Makefile
net/openssh/files/S50sshd [deleted file]
net/openssh/files/sshd.init [new file with mode: 0755]
net/p910nd/Makefile
net/parprouted/Makefile
net/parprouted/files/parprouted.init
net/peerguardian/files/peerguardian.init
net/portmap/Makefile
net/portmap/files/portmap.init
net/pptpd/Makefile
net/pptpd/files/pptpd.init
net/quagga/Makefile
net/quagga/files/quagga [new file with mode: 0644]
net/quagga/files/quagga.init
net/radvd/Makefile
net/rarpd/Makefile
net/rarpd/files/rarpd.init
net/reaim/Makefile
net/reaim/files/reaim.init
net/rp-l2tp/files/rp-l2tpd.init
net/rp-pppoe/files/pppoe-relay.init
net/rp-pppoe/files/pppoe-server.init
net/samba/files/samba.init
net/scanlogd/Makefile
net/siproxd/files/siproxd.init
net/srelay/Makefile
net/tinyproxy/files/tinyproxy.init
net/tor/files/tor.init
net/ulogd/Makefile
net/ulogd/files/ulogd.init
net/updatedd/Makefile
net/updatedd/files/S55ddns [deleted file]
net/updatedd/files/ddns.init [new file with mode: 0644]
net/vrrpd/files/vrrpd.init
net/wifidog/Makefile
net/xinetd/files/xinetd.init
sound/mt-daapd/files/mt-daapd.init
utils/collectd/Makefile
utils/collectd/files/S80collectd [deleted file]
utils/collectd/files/collectd.init [new file with mode: 0755]
utils/rrdcollect/Makefile
utils/rrdcollect/files/rrdcollect.init
utils/setserial/Makefile
utils/setserial/files/serial.init

index 11eb303..c47f4da 100644 (file)
@@ -5,9 +5,9 @@ BIN=monit
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $RUN_D
        $BIN $OPTIONS
 }
index 0fc6e76..9854f34 100644 (file)
@@ -6,9 +6,9 @@ DEFAULT=/etc/default/$BIN
 LIB_D=/var/lib/osiris
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $LIB_D
        mkdir -p $RUN_D
        $BIN $OPTIONS
index 1ef4e72..723c3de 100644 (file)
@@ -20,7 +20,6 @@ PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_INIT_LEVEL:=60
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -56,7 +55,7 @@ define Package/syslog-ng/install
        install -d -m0755 $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/syslog-ng $(1)/usr/sbin/
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/syslog-ng.init $(1)/etc/init.d/S$(PKG_INIT_LEVEL)syslog-ng
+       install -m0755 ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
        install -d -m0755 $(1)/etc/syslog-ng
        install -m0644 ./files/syslog-ng.conf $(1)/etc/syslog-ng/
 endef
index aab01e4..3d8435e 100644 (file)
@@ -58,7 +58,7 @@ endef
 define Package/mrd6/install
        install -d -m0755 $(1)/etc/init.d
        install -m0644 files/mrd6.conf $(1)/etc
-       install -m0755 files/mrd6.init $(1)/etc/init.d/S60mrd6
+       install -m0755 files/mrd6.init $(1)/etc/init.d/mrd6
 endef
 
 $(eval $(call BuildPackage,mrd6))
index b29387b..9cf3691 100644 (file)
@@ -1,19 +1,11 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
-export PHP_FCGI_CHILDREN=''
-PORT=1026
-BIN=/usr/sbin/php
+start() {
+       $BIN -b $PORT &
+}
 
-case $1 in
- start)
-  $BIN -b $PORT &
-  ;;
- stop)
-  kill `pidof php`
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
+stop() {
+       killall php
+}
 
-exit $?
index 81ceb9b..f8bee67 100644 (file)
@@ -5,9 +5,9 @@ BIN=avahi-daemon
 DEFAULT=/etc/default/$BIN
 OPTIONS="-D"
 RUN_D=/var/run/$BIN
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $RUN_D
        $BIN $OPTIONS
 }
index 3de6e6e..7967153 100644 (file)
@@ -4,9 +4,9 @@
 DEFAULT=/etc/default/autopid
 RUN_D=/var/run
 PID_F=$RUN_D/autoipd.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $RUN_D ] || mkdir -p $RUN_D
        autoipd $OPTIONS
 }
index aae87c3..415caae 100644 (file)
@@ -4,9 +4,9 @@
 DEFAULT=/etc/default/mDNSResponder
 RUN_D=/var/run
 PID_F=$RUN_D/mDNSResponder.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $RUN_D ] || mkdir -p $RUN_D
        mDNSResponder $OPTIONS
 }
index 0569e68..59a3f3b 100644 (file)
@@ -4,9 +4,9 @@
 DEFAULT=/etc/default/nifd
 RUN_D=/var/run
 PID_F=$RUN_D/nifd.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $RUN_D ] || mkdir -p $RUN_D
        nifd $OPTIONS
 }
index 42af3f7..d3206e7 100644 (file)
@@ -7,9 +7,9 @@ LOG_D=/var/log
 RUN_D=/var/run
 PID_F=$RUN_D/snmpd.pid
 
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $LIB_D ] || mkdir -p $LIB_D
        [ -d $LOG_D ] || mkdir -p $LOG_D
        [ -d $RUN_D ] || mkdir -p $RUN_D
index aec2c09..676fd86 100644 (file)
@@ -65,7 +65,6 @@ define Package/peercast/install
        install -m0644 ./files/peercast.ini $(1)/etc/
        install -m0755 -d $(1)/etc/init.d
        install -m0755 ./files/peercast.init $(1)/etc/init.d/peercast
-       ln -sf peercast $(1)/etc/init.d/S60peercast
 endef
 
 $(eval $(call BuildPackage,peercast))
index 9d2242e..c0b4b3a 100644 (file)
@@ -43,7 +43,7 @@ endef
 define Package/aiccu/install
        mkdir -p $(1)/usr/sbin $(1)/etc/init.d
        install -m 755 $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/
-       install -m 755 ./files/aiccu.init $(1)/etc/init.d/S51aiccu
+       install -m 755 ./files/aiccu.init $(1)/etc/init.d/aiccu
        install -m 644 $(PKG_BUILD_DIR)/doc/aiccu.conf $(1)/etc/aiccu.conf
 endef
 
index 1df0c67..5ba9846 100644 (file)
@@ -20,8 +20,6 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-PKG_INIT_PRIO:=60
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/asterisk/Default
@@ -392,7 +390,7 @@ define Package/asterisk/install
        install -m0644  ./files/asterisk.default $(1)/etc/default/asterisk
        install -d -m0755 $(1)/etc/init.d
        install -m0755  ./files/asterisk.init $(1)/etc/init.d/asterisk
-       ln -sf asterisk $(1)/etc/init.d/S60asterisk
+       ln -sf asterisk $(1)/etc/init.d/asterisk
 endef
 
 define Package/asterisk-mini/install
@@ -418,7 +416,7 @@ define Package/asterisk-mini/install
        install -m0644  ./files/asterisk.default $(1)/etc/default/asterisk
        install -d -m0755 $(1)/etc/init.d
        install -m0755  ./files/asterisk.init $(1)/etc/init.d/asterisk
-       ln -sf asterisk $(1)/etc/init.d/S$(PKG_INIT_PRIO)asterisk
+       ln -sf asterisk $(1)/etc/init.d/asterisk
 endef
 
 define Package/asterisk-mysql/install
index 698c3df..1c97a18 100644 (file)
@@ -1,23 +1,17 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
 DEFAULT=/etc/default/asterisk
 OPTIONS=""
-[ -f $DEFAULT ] && . $DEFAULT
-[ "$ENABLE_ASTERISK" = "yes" ] || exit 0
 
-case $1 in
- start)
-  [ -d /var/run ] || mkdir -p /var/run
-  [ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
-  [ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
-  /usr/sbin/asterisk $OPTIONS
-  ;;
- stop)
-  [ -f /var/run/asterisk.pid ] && kill $(cat /var/run/asterisk.pid) >/dev/null 2>&1
-  ;;
- *)
-  echo "usage: $0 (start|stop)"
-  exit 1
-esac
+start() {
+       [ -f $DEFAULT ] && . $DEFAULT
+       [ -d /var/run ] || mkdir -p /var/run
+       [ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
+       [ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
+       /usr/sbin/asterisk $OPTIONS
+}
 
-exit $?
+stop() {
+       [ -f /var/run/asterisk.pid ] && kill $(cat /var/run/asterisk.pid) >/dev/null 2>&1
+}
index 808949e..19812c4 100644 (file)
@@ -118,7 +118,7 @@ define Package/bind-server/install
        install -d -m0755 $(1)/etc/init.d
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/
        $(CP) files/bind $(1)/etc
-       $(CP) files/named.init $(1)/etc/init.d/S$(PKG_INIT_LEVEL)named
+       $(CP) files/named.init $(1)/etc/init.d/named
        find $(1)/etc/bind -name ".svn" | xargs rm -rf
 endef
 
index a355e70..bfd6370 100644 (file)
@@ -61,14 +61,14 @@ define Build/Compile
        $(CP) $(PKG_BUILD_DIR)/translation $(PKG_INSTALL_DIR)/usr/lib/bx/
        bzip2 $(PKG_INSTALL_DIR)/usr/lib/bx/translation/*
        $(CP) ./files/bitchxrc $(PKG_INSTALL_DIR)/tmp/.bitchxrc
-       $(CP) ./files/S98bitchxrc $(PKG_INSTALL_DIR)/etc/init.d/S98bitchxrc
+       $(CP) ./files/bitchxrc.init $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc
 endef
 
 define Package/bitchx/install
        install -m0755 -d $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/tmp
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/etc/init.d/S98bitchxrc $(1)/etc/init.d/
+       $(CP) $(PKG_INSTALL_DIR)/etc/init.d/bitchxrc $(1)/etc/init.d/
        $(CP) $(PKG_INSTALL_DIR)/tmp/.bitchxrc $(1)/tmp
 endef
 
diff --git a/net/bitchx/files/S98bitchxrc b/net/bitchx/files/S98bitchxrc
deleted file mode 100755 (executable)
index eda8a03..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-start() {
-       # make /tmp/.bitchxrc as many servers ban root
-       if [ ! -e /tmp/.bitchxrc ]
-       then
-               echo "IRCUSER OpenWrt" >/tmp/.bitchxrc
-               echo "IRCNAME OpenWrt User!" >>/tmp/.bitchxrc
-       fi
-}
diff --git a/net/bitchx/files/bitchxrc.init b/net/bitchx/files/bitchxrc.init
new file mode 100755 (executable)
index 0000000..e5966d3
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+start() {
+       # make /tmp/.bitchxrc as many servers ban root
+       if [ ! -e /tmp/.bitchxrc ]
+       then
+               echo "IRCUSER OpenWrt" >/tmp/.bitchxrc
+               echo "IRCNAME OpenWrt User!" >>/tmp/.bitchxrc
+       fi
+}
index de6ede3..ad7ee36 100644 (file)
@@ -38,7 +38,6 @@ endef
 define Package/bitlbee/conffiles
 /etc/bitlbee/motd.txt
 /etc/bitlbee/bitlbee.conf
-/etc/init.d/S55bitlbee
 endef
 
 define Build/Configure
@@ -81,7 +80,7 @@ define Package/bitlbee/install
        $(MAKE) -C $(PKG_BUILD_DIR)/doc/user-guide \
                DESTDIR="$(1)" install 
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/S55bitlbee $(1)/etc/init.d/S55bitlbee
+       install -m0755 ./files/bitlbee.init $(1)/etc/init.d/bitlbee
 endef
 
 $(eval $(call BuildPackage,bitlbee))
diff --git a/net/bitlbee/files/S55bitlbee b/net/bitlbee/files/S55bitlbee
deleted file mode 100755 (executable)
index 95c5f59..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-start() {
-       mkdir -p /var/lib/bitlbee
-       bitlbee -D
-}
-
-stop() {
-       killall bitlbee
-}
diff --git a/net/bitlbee/files/bitlbee.init b/net/bitlbee/files/bitlbee.init
new file mode 100755 (executable)
index 0000000..95c5f59
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+start() {
+       mkdir -p /var/lib/bitlbee
+       bitlbee -D
+}
+
+stop() {
+       killall bitlbee
+}
index 4e88b31..cfa49e8 100644 (file)
@@ -98,7 +98,7 @@ define Package/roofnet/install
        $(CP) $(PKG_BUILD_DIR)/conf/wifi/read_handler $(1)/usr/bin
        $(CP) $(PKG_BUILD_DIR)/conf/wifi/write_handler $(1)/usr/bin
        mkdir -p $(1)/etc/init.d
-       install -m 755 ./files/S50roofnet $(1)/etc/init.d/
+       install -m 755 ./files/roofnet.init $(1)/etc/init.d/roofnet
 endef
 
 $(eval $(call BuildPackage,click))
diff --git a/net/click/files/S50roofnet b/net/click/files/S50roofnet
deleted file mode 100755 (executable)
index 256e2ab..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-start() {
-       killall -q click
-       cp /usr/bin/srcr.click /tmp
-       sh /usr/bin/gen_config_roofnet.sh > /tmp/unaligned.click
-       click-align /tmp/unaligned.click > /tmp/roofnet.click
-       /usr/bin/click /tmp/roofnet.click > /tmp/roofnet.log 2>&1 &
-}
-
-stop() {
-       killall click
-}
diff --git a/net/click/files/roofnet.init b/net/click/files/roofnet.init
new file mode 100755 (executable)
index 0000000..256e2ab
--- /dev/null
@@ -0,0 +1,14 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+start() {
+       killall -q click
+       cp /usr/bin/srcr.click /tmp
+       sh /usr/bin/gen_config_roofnet.sh > /tmp/unaligned.click
+       click-align /tmp/unaligned.click > /tmp/roofnet.click
+       /usr/bin/click /tmp/roofnet.click > /tmp/roofnet.log 2>&1 &
+}
+
+stop() {
+       killall click
+}
index 3e51a83..a885298 100644 (file)
@@ -96,7 +96,7 @@ define Package/cups/install
        $(CP) ./files/etc/cups/* $(1)/etc/cups/
        # install initscript with priority 60
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/cupsd.init $(1)/etc/init.d/S60cupsd
+       install -m0755 ./files/cupsd.init $(1)/etc/init.d/cupsd
 endef
 
 define Build/InstallDev
index cfb2ff8..4b5cdce 100644 (file)
@@ -5,9 +5,9 @@ DEFAULT=/etc/default/radiusd
 LOG_D=/var/log/radius
 RUN_D=/var/run
 PID_F=$RUN_D/radiusd.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $LOG_D ] || mkdir -p $LOG_D
        [ -d $RUN_D ] || mkdir -p $RUN_D
        radiusd $OPTIONS
index 71ffa8d..f9e3705 100644 (file)
@@ -5,9 +5,9 @@ BIN=gmediaserver
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        $BIN $OPTIONS
 }
 
index 05354c6..61449f9 100644 (file)
@@ -45,7 +45,7 @@ define Package/htpdate/install
        install -m0644 ./files/htpdate.default $(1)/etc/default/htpdate
        install -d -m0755 $(1)/etc/init.d/
        install -m0755 ./files/htpdate.init $(1)/etc/init.d/htpdate
-       ln -sf htpdate $(1)/etc/init.d/S49htpdate
+       ln -sf htpdate $(1)/etc/init.d/htpdate
        install -d -m0755 $(1)/usr/sbin
        install -m0755 $(PKG_BUILD_DIR)/htpdate $(1)/usr/sbin/
 endef
index 97ec97d..1409321 100644 (file)
@@ -1,13 +1,14 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=49
 BIN=htpdate
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $RUN_D
        $BIN -l -s -t $OPTIONS && $BIN -D $OPTIONS
 }
index eeecae5..7549c19 100644 (file)
@@ -1,13 +1,14 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=60
 BIN=l2tpd
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        $BIN $OPTIONS
 }
 
index 3e46924..fe0ca22 100644 (file)
@@ -6,9 +6,9 @@ DEFAULT=/etc/default/$BIN
 LOG_D=/var/log/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $LOG_D
        mkdir -p $RUN_D
        $BIN $OPTIONS
index d807ad3..79ea02c 100644 (file)
@@ -61,7 +61,7 @@ define Package/maradns/install
        install -d -m0755 $(1)/etc
        install -m0644 ./files/mararc $(1)/etc/mararc
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/maradns.init $(1)/etc/init.d/S60maradns
+       install -m0755 ./files/maradns.init $(1)/etc/init.d/maradns
        install -d -m0755 $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone,fetchzone,duende} $(1)/usr/bin/
        install -d -m0755 $(1)/usr/sbin
index 3afa9de..5b59cb0 100644 (file)
@@ -53,7 +53,7 @@ define Package/miau/install
        install -d -m0755 $(1)/etc/init.d
        install -d -m0755 $(1)/etc/default
        install -d -m0755 $(1)/etc/miau
-       install -m0755 ./files/S50miau $(1)/etc/init.d/S50miau
+       install -m0755 ./files/miau.init $(1)/etc/init.d/miau
        install -m0644 ./files/miau $(1)/etc/default/miau
        install -m0644 ./files/miaurc $(1)/etc/miau/miaurc
 endef
diff --git a/net/miau/files/S50miau b/net/miau/files/S50miau
deleted file mode 100755 (executable)
index 892c23c..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-DEFAULT="/etc/default/miau"
-OPTIONS="-d /etc/miau/"
-LOG_DIR="/var/log/miau"
-ERR_LOG="$LOG_DIR/error.log"
-OUT_LOG="$LOG_DIR/miau.log"
-
-start() {
-       [ -f $DEFAULT ] && . $DEFAULT
-       [ "$ENABLE_MIAU" = "yes" ] || exit 0
-       [ -f /var/run/miau.pid ] && {
-               echo "[ERROR] miau is running"
-               exit 0
-       }
-       [ -d $LOG_DIR ] || mkdir -p $LOG_DIR 
-       /usr/bin/miau -f $OPTIONS > $OUT_LOG 2> $ERR_LOG &
-       PID=$!
-       sleep 1 
-       if [ -d /proc/$PID ]; then
-               echo $PID > /var/run/miau.pid 
-       else 
-               echo "[ERROR] Unable to run miau as a daemon"
-       fi
-}
-
-stop() {
-       [ -f /var/run/miau.pid ] && kill $(cat /var/run/miau.pid) >/dev/null 2>&1 && rm /var/run/miau.pid
-}
diff --git a/net/miau/files/miau.init b/net/miau/files/miau.init
new file mode 100755 (executable)
index 0000000..892c23c
--- /dev/null
@@ -0,0 +1,30 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+DEFAULT="/etc/default/miau"
+OPTIONS="-d /etc/miau/"
+LOG_DIR="/var/log/miau"
+ERR_LOG="$LOG_DIR/error.log"
+OUT_LOG="$LOG_DIR/miau.log"
+
+start() {
+       [ -f $DEFAULT ] && . $DEFAULT
+       [ "$ENABLE_MIAU" = "yes" ] || exit 0
+       [ -f /var/run/miau.pid ] && {
+               echo "[ERROR] miau is running"
+               exit 0
+       }
+       [ -d $LOG_DIR ] || mkdir -p $LOG_DIR 
+       /usr/bin/miau -f $OPTIONS > $OUT_LOG 2> $ERR_LOG &
+       PID=$!
+       sleep 1 
+       if [ -d /proc/$PID ]; then
+               echo $PID > /var/run/miau.pid 
+       else 
+               echo "[ERROR] Unable to run miau as a daemon"
+       fi
+}
+
+stop() {
+       [ -f /var/run/miau.pid ] && kill $(cat /var/run/miau.pid) >/dev/null 2>&1 && rm /var/run/miau.pid
+}
index b050b55..d8c3d4c 100644 (file)
@@ -5,9 +5,9 @@ BIN=miredo-server
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $RUN_D ] || mkdir -p $RUN_D
        insmod ipv6
        insmod tun
index 7fe13d9..dbf46a6 100644 (file)
@@ -5,9 +5,9 @@ BIN=miredo
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $RUN_D ] || mkdir -p $RUN_D
        insmod ipv6
        insmod tun
index 134d3d5..add3136 100644 (file)
@@ -41,7 +41,7 @@ endef
 
 define Package/netperf/install 
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/netserver.init $(1)/etc/init.d/S51netserver
+       install -m0755 ./files/netserver.init $(1)/etc/init.d/netserver
        install -d -m0755 $(1)/usr/bin
        install -m0755 $(PKG_BUILD_DIR)/netperf $(1)/usr/bin/
        install -m0755 $(PKG_BUILD_DIR)/netserver $(1)/usr/bin/
index cae589f..b16107a 100644 (file)
@@ -55,7 +55,7 @@ endef
 define Package/nfs-kernel-server/install
        install -d -m755 $(1)/etc/init.d $(1)/usr/sbin
        install -m0644 ./files/nfsd.exports $(1)/etc/exports
-       install -m0755 ./files/nfsd.init $(1)/etc/init.d/S60nfsd
+       install -m0755 ./files/nfsd.init $(1)/etc/init.d/nfsd
        install -m0755 $(PKG_BUILD_DIR)/utils/lockd/lockd $(1)/usr/sbin/rpc.lockd
        install -m0755 $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd
        install -m0755 $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd
index 21adf5b..cb4bae5 100644 (file)
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=60
 NFS_D=/var/lib/nfs
 
 start() {
index 3132f12..c66aa37 100644 (file)
@@ -38,7 +38,7 @@ define Package/nfs-server/install
        install -d -m0755 $(1)/etc
        install -m0644 ./files/nfsd.exports $(1)/etc/exports
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/nfsd.init $(1)/etc/init.d/S60nfsd
+       install -m0755 ./files/nfsd.init $(1)/etc/init.d/nfsd
        install -d -m0755 $(1)/usr/sbin
        install -m0755 $(PKG_BUILD_DIR)/rpc.* $(1)/usr/sbin/
 endef
index 64a8305..b951305 100644 (file)
@@ -44,7 +44,7 @@ define Package/oidentd/install
        install -m0755 -d $(1)/usr/sbin
        install -m0755 -d $(1)/etc/init.d
        $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/
-       $(CP) ./files/S85oidentd $(1)/etc/init.d
+       $(CP) ./files/oidentd.init $(1)/etc/init.d/oidentd
 endef
 
 $(eval $(call BuildPackage,oidentd))
diff --git a/net/oidentd/files/S85oidentd b/net/oidentd/files/S85oidentd
deleted file mode 100755 (executable)
index a2c04b7..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-start() {
-       /usr/sbin/oidentd -m -f 113
-}
-
-stop() {
-       killall oidentd
-}
diff --git a/net/oidentd/files/oidentd.init b/net/oidentd/files/oidentd.init
new file mode 100755 (executable)
index 0000000..2bdc34d
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=85
+start() {
+       /usr/sbin/oidentd -m -f 113
+}
+
+stop() {
+       killall oidentd
+}
index d9b9c8c..ea85770 100644 (file)
@@ -109,7 +109,7 @@ define Package/olsrd/install
        install -d -m0755 $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(1)/usr/sbin/
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/olsrd.init $(1)/etc/init.d/S60olsrd
+       install -m0755 ./files/olsrd.init $(1)/etc/init.d/olsrd
 endef
 
 define Package/olsrd-mod-dot-draw/install
index f59ff7e..3cdd6ae 100644 (file)
@@ -2,9 +2,9 @@
 # Copyright (C) 2006 OpenWrt.org
 
 DEFAULT=/etc/default/olsrd
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        olsrd $OPTIONS
 }
 
index 35c1994..0f859b3 100644 (file)
@@ -90,7 +90,7 @@ define Package/openntpd/install
        install -d -m0755 $(1)/etc
        install -m0644 ./files/ntpd.conf $(1)/etc/
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/ntpd.init $(1)/etc/init.d/S55ntpd
+       install -m0755 ./files/ntpd.init $(1)/etc/init.d/ntpd
        install -d -m0755 $(1)/usr/sbin/
        install -m0755 $(PKG_BUILD_DIR)/ntpd $(1)/usr/sbin/
 endef
index e680f62..2fc4bb8 100644 (file)
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=60
 start() {
        mkdir -p `awk -F: '/^ntp:/{print $6}' /etc/passwd`
        /usr/sbin/ntpd -s
index 32a6359..de806a5 100644 (file)
@@ -152,7 +152,7 @@ define Package/openssh-server/install
        chmod 0700 $(1)/etc/ssh
        $(CP) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
        install -m0755 -d $(1)/etc/init.d
-       install -m0755 ./files/S50sshd $(1)/etc/init.d/
+       install -m0755 ./files/sshd.init $(1)/etc/init.d/sshd
        install -m0755 -d $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(1)/usr/bin/
        install -m0755 -d $(1)/usr/sbin
diff --git a/net/openssh/files/S50sshd b/net/openssh/files/S50sshd
deleted file mode 100755 (executable)
index c2e535d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-start() {
-       for type in rsa dsa; do {
-               # check for keys
-               key=/etc/ssh/ssh_host_${type}_key
-               [ ! -f $key ] && {
-                       # generate missing keys
-                       [ -x /usr/bin/ssh-keygen ] && {
-                               /usr/bin/ssh-keygen -N '' -t $type -f $key 2>&- >&- && exec $0 $*
-                       } &
-                       exit 0
-               }
-       }; done
-       mkdir -p /var/empty
-       /usr/sbin/sshd
-}
-
-stop() {
-       killall sshd
-}
diff --git a/net/openssh/files/sshd.init b/net/openssh/files/sshd.init
new file mode 100755 (executable)
index 0000000..c2e535d
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+start() {
+       for type in rsa dsa; do {
+               # check for keys
+               key=/etc/ssh/ssh_host_${type}_key
+               [ ! -f $key ] && {
+                       # generate missing keys
+                       [ -x /usr/bin/ssh-keygen ] && {
+                               /usr/bin/ssh-keygen -N '' -t $type -f $key 2>&- >&- && exec $0 $*
+                       } &
+                       exit 0
+               }
+       }; done
+       mkdir -p /var/empty
+       /usr/sbin/sshd
+}
+
+stop() {
+       killall sshd
+}
index 87e04d4..a023d6d 100644 (file)
@@ -56,7 +56,6 @@ define Package/p910nd/install
        install -d -m0755 $(1)/etc/init.d
        install -m0755 ./files/p910nd.init $(1)/etc/init.d/p910nd
        install -d -m0755 $(1)/usr/sbin
-       ln -sf p910nd $(1)/etc/init.d/S$(PKG_INIT_PRIO)p910nd
        install -m0755 $(PKG_BUILD_DIR)/p910nd $(1)/usr/sbin/
 endef
 
index 9fd309a..d9456de 100644 (file)
@@ -42,7 +42,6 @@ define Package/parprouted/install
        install -m0755 ./files/parprouted.default $(1)/etc/default/parprouted
        install -d -m0755 $(1)/etc/init.d
        install -m0755 ./files/parprouted.init $(1)/etc/init.d/parprouted
-       ln -sf parprouted $(1)/etc/init.d/S50parpouted
        install -d -m0755 $(1)/usr/sbin
        install -m0755 $(PKG_BUILD_DIR)/parprouted $(1)/usr/sbin/
 endef
index aae46fc..b0911b6 100755 (executable)
@@ -3,9 +3,9 @@
 
 BIN=parprouted
 DEFAULT=/etc/default/$BIN
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        $BIN $OPTIONS
 }
 
index cd786b8..45f1511 100644 (file)
@@ -3,11 +3,11 @@
 
 BIN=pgtext
 DEFAULT=/etc/default/$BIN
-[ -f $DEFAULT ] && . $DEFAULT
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN_${IF}_${ID}.pid
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        $BIN $OPTIONS
 }
 
index 05b19c4..562ff29 100644 (file)
@@ -42,7 +42,6 @@ endef
 define Package/portmap/install 
        install -d -m0755 $(1)/etc/init.d 
        install -m0755 ./files/portmap.init $(1)/etc/init.d/portmap
-       ln -sf portmap $(1)/etc/init.d/S59portmap
        install -d -m0755 $(1)/usr/sbin 
        install -m0755 $(PKG_BUILD_DIR)/portmap $(1)/usr/sbin/
 endef
index fd4be73..3bbfb57 100644 (file)
@@ -1,11 +1,12 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=40
 BIN=portmap
 DEFAULT=/etc/default/$BIN
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        $BIN $OPTIONS
 }
 
index 0e5bb12..4972024 100644 (file)
@@ -49,7 +49,7 @@ define Package/pptpd/install
        install -d -m0755 $(1)/etc
        install -m0644 ./files/pptpd.conf $(1)/etc/
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/pptpd.init $(1)/etc/init.d/S50pptpd
+       install -m0755 ./files/pptpd.init $(1)/etc/init.d/pptpd
        install -d -m0755 $(1)/etc/ppp
        install -m0644 ./files/options.pptpd $(1)/etc/ppp/
        install -d -m0755 $(1)/usr/sbin
index 40e4d7e..a74973c 100644 (file)
@@ -1,13 +1,14 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=60
 BIN=pptpd
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $RUN_D
        for m in arc4 sha1 slhc crc-ccitt ppp_generic ppp_async ppp_mppe_mppc; do
                insmod $m >/dev/null 2>&1
index eb733bc..33bb2e1 100644 (file)
@@ -124,8 +124,8 @@ define Package/quagga/install
        install -d -m0755 $(1)/etc/quagga/
        chmod 0750 $(1)/etc/quagga/
        install -d -m0755 $(1)/etc/init.d/
+       install -m0755 ./files/quagga $(1)/usr/sbin/quagga.init
        install -m0755 ./files/quagga.init $(1)/etc/init.d/quagga
-       ln -sf quagga $(1)/etc/init.d/S49quagga
        install -d -m0755 $(1)/var/run/quagga
 endef
 
diff --git a/net/quagga/files/quagga b/net/quagga/files/quagga
new file mode 100644 (file)
index 0000000..01f8d71
--- /dev/null
@@ -0,0 +1,333 @@
+#!/bin/sh
+#
+# quagga       Starts/stops quagga daemons and watchquagga.
+#              Create a daemon.conf file to have that routing daemon
+#              started/stopped automagically when using this script
+#              without any daemon names as args.
+#              If watchquagga is available, it will also be
+#              started/stopped if the script is called without
+#              any daemon names.
+#
+
+ME=$(basename $0)
+
+usage() {
+       echo "Usage: ${ME} {start|stop|restart} [daemon ...]"
+       exit 2
+}
+
+if [ -z "$1" ]
+then
+       usage
+else
+       COMMAND=$1
+fi
+shift
+ARG_DAEMONS=$*
+BINDIR=/usr/sbin
+CONFDIR=/etc/quagga
+STATEDIR=/var/run/quagga
+DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
+DAEMON_FLAGS=-d
+WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
+WATCHQUAGGA_CMD="$0 watchrestart"
+if [ ${COMMAND} != "watchrestart" ]
+then
+       DAEMONS="${DAEMONS} watchquagga"
+fi
+DAEMONS_STARTSEQ=${DAEMONS}
+
+reverse()
+{
+       local revlist r
+        revlist=
+        for r
+       do
+                revlist="$r $revlist"
+        done
+        echo $revlist
+}
+
+DAEMONS_STOPSEQ=$(reverse ${DAEMONS_STARTSEQ})
+
+#pidof() {
+#      ps ax | awk 'match($5, "(^|/)'"$1"'$") > 0 { printf " %s", $1 }'
+#}
+
+quit() {
+       echo "${ME}: $1"
+       exit 0
+}
+
+die() {
+       echo "${ME}: $1"
+       exit 1
+}
+
+is_in() {
+       local i
+       for i in $2
+       do
+               [ "$1" = "$i" ] && return 0
+       done
+       return 1
+}
+
+select_subset() {
+       local unknown i j
+       unknown=
+       RESULT=
+       for i in $1
+       do
+               is_in $i "$2" || unknown="$unknown $i"
+       done
+       if [ -n "$unknown" ]
+       then
+               RESULT=$unknown
+               return 1
+       else
+               for j in $2
+               do
+                       is_in $j "$1" && RESULT="$RESULT $j"
+               done
+               return 0
+       fi
+}
+
+# check command
+
+case ${COMMAND}
+in
+       start|stop|restart)
+               ;;
+       watchrestart)
+               if [ -n "$ARG_DAEMONS" ]
+               then
+                       echo "${ME}: watchrestart mode is only for use by watchquagga"
+                       exit 2
+               fi
+               ;;
+       *)
+               usage
+               ;;
+esac
+
+# select daemons to start
+
+case ${COMMAND}
+in
+       start|restart|watchrestart)
+               START_DAEMONS=
+               for d in ${DAEMONS_STARTSEQ}
+               do
+                       [ -x "${BINDIR}/${d}" -a -f "${CONFDIR}/${d}.conf" ] \
+                       && START_DAEMONS="${START_DAEMONS}${d} "
+               done
+               WATCHQUAGGA_DAEMONS=${START_DAEMONS}
+               if is_in watchquagga "${DAEMONS_STARTSEQ}"
+               then
+                       START_DAEMONS="${START_DAEMONS} watchquagga"
+               fi
+               if [ -n "${ARG_DAEMONS}" ]
+               then
+                       if select_subset "${ARG_DAEMONS}" "${DAEMONS}"
+                       then
+                               if select_subset "${ARG_DAEMONS}" "${START_DAEMONS}"
+                               then
+                                       START_DAEMONS=${RESULT}
+                               else
+                                       die "these daemons are not startable:${RESULT}."
+                               fi
+                       else
+                               die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
+                       fi
+               fi
+               ;;
+esac
+
+# select daemons to stop
+
+case ${COMMAND}
+in
+       stop|restart|watchrestart)
+               STOP_DAEMONS=${DAEMONS_STOPSEQ}
+               if [ -n "${ARG_DAEMONS}" ]
+               then
+                       if select_subset "${ARG_DAEMONS}" "${STOP_DAEMONS}"
+                       then
+                               STOP_DAEMONS=${RESULT}
+                       else
+                               die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
+                       fi
+               fi
+               stop_daemons=
+               for d in ${STOP_DAEMONS}
+               do
+                       pidfile=${STATEDIR}/${d}.pid
+                       if [ -f "${pidfile}" -o -n "$(pidof ${d})" ]
+                       then
+                               stop_daemons="${stop_daemons}${d} "
+                       elif [ -n "${ARG_DAEMONS}" ]
+                       then
+                               echo "${ME}: found no ${d} process running."
+                       fi
+               done
+               STOP_DAEMONS=${stop_daemons}
+               ;;
+esac
+
+# stop daemons
+
+for d in $STOP_DAEMONS
+do
+       echo -n "${ME}: Stopping ${d} ... "
+       pidfile=${STATEDIR}/${d}.pid
+       if [ -f "${pidfile}" ]
+       then
+               file_pid=$(cat ${pidfile})
+               if [ -z "${file_pid}" ]
+               then
+                       echo -n "no pid file entry found ... "
+               fi
+       else
+               file_pid=
+               echo -n "no pid file found ... "
+       fi
+       proc_pid=$(pidof ${d})
+       if [ -z "${proc_pid}" ]
+       then
+               echo -n "found no ${d} process running ... "
+       else
+               count=0
+               notinpidfile=
+               for p in ${proc_pid}
+               do
+                       count=$((${count}+1))
+                       if kill ${p}
+                       then
+                               echo -n "killed ${p} ... "
+                       else
+                               echo -n "failed to kill ${p} ... "
+                       fi
+                       [ "${p}" = "${file_pid}" ] \
+                       || notinpidfile="${notinpidfile} ${p}"
+               done
+               [ ${count} -le 1 ] \
+               || echo -n "WARNING: ${count} ${d} processes were found running ... "
+               for n in ${notinpidfile}
+               do
+                       echo -n "WARNING: process ${n} was not in pid file ... "
+               done
+       fi
+       count=0
+       survivors=$(pidof ${d})
+       while [ -n "${survivors}" ]
+       do
+               sleep 1
+               count=$((${count}+1))
+               survivors=$(pidof ${d})
+               [ -z "${survivors}" -o ${count} -gt 5 ] && break
+               for p in ${survivors}
+               do
+                       sleep 1
+                       echo -n "${p} "
+                       kill ${p}
+               done
+       done
+       survivors=$(pidof ${d})
+       [ -n "${survivors}" ] && \
+       if kill -KILL ${survivors}
+       then
+               echo -n "KILLed ${survivors} ... "
+       else
+               echo -n "failed to KILL ${survivors} ... "
+       fi
+       sleep 1
+       survivors=$(pidof ${d})
+       if [ -z "${survivors}" ]
+       then
+               echo -n "done."
+               if [ -f "${pidfile}" ]
+               then
+                       rm -f ${pidfile} \
+                       || echo -n " Failed to remove pidfile."
+               fi
+       else
+               echo -n "failed to stop ${survivors} - giving up."
+               if [ "${survivors}" != "${file_pid}" ]
+               then
+                       if echo "${survivors}" > ${pidfile}
+                       then
+                               chown quagga:quagga ${pidfile}
+                               echo -n " Wrote ${survivors} to pidfile."
+                       else
+                               echo -n " Failed to write ${survivors} to pidfile."
+                       fi
+               fi
+       fi
+       echo
+done
+
+# start daemons
+
+if [ -n "$START_DAEMONS" ]
+then
+       [ -d ${CONFDIR} ] \
+       || quit "${ME}: no config directory ${CONFDIR} - exiting."
+       chown -R quagga:quagga ${CONFDIR}
+       [ -d ${STATEDIR} ] || mkdir -p ${STATEDIR} \
+       || die "${ME}: could not create state directory ${STATEDIR} - exiting."
+       chown -R quagga:quagga ${STATEDIR}
+
+       for d in $START_DAEMONS
+       do
+               echo -n "${ME}: Starting ${d} ... "
+               proc_pid=$(pidof ${d})
+               pidfile=${STATEDIR}/${d}.pid
+               file_pid=
+               if [ -f "${pidfile}" ]
+               then
+                       file_pid=$(cat ${pidfile})
+                       if [ -n "${file_pid}" ]
+                       then
+                               echo -n "found old pid file entry ${file_pid} ... "
+                       fi
+               fi
+               if [ -n "${proc_pid}" ]
+               then
+                       echo -n "found ${d} running (${proc_pid}) - skipping ${d}."
+                       if [ "${proc_pid}" != "${file_pid}" ]
+                       then
+                               if echo "${proc_pid}" > ${pidfile}
+                               then
+                                       chown quagga:quagga ${pidfile}
+                                       echo -n " Wrote ${proc_pid} to pidfile."
+                               else
+                                       echo -n " Failed to write ${proc_pid} to pidfile."
+                               fi
+                       fi
+               elif rm -f "${pidfile}"
+               then
+                       if [ "${d}" = "watchquagga" ]
+                       then
+                               $("${BINDIR}/${d}" \
+                                       ${WATCHQUAGGA_FLAGS} \
+                                       "${WATCHQUAGGA_CMD}" \
+                                       ${WATCHQUAGGA_DAEMONS})
+                               status=$?
+                       else
+                               $("${BINDIR}/${d}" ${DAEMON_FLAGS})
+                               status=$?
+                       fi
+                       if [ $status -eq 0 ]
+                       then
+                               echo -n "done."
+                       else
+                               echo -n "failed."
+                       fi
+               else
+                       echo -n " failed to remove pidfile."
+               fi
+               echo
+       done
+fi
index 01f8d71..21fbf2c 100644 (file)
-#!/bin/sh
-#
-# quagga       Starts/stops quagga daemons and watchquagga.
-#              Create a daemon.conf file to have that routing daemon
-#              started/stopped automagically when using this script
-#              without any daemon names as args.
-#              If watchquagga is available, it will also be
-#              started/stopped if the script is called without
-#              any daemon names.
-#
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
-ME=$(basename $0)
-
-usage() {
-       echo "Usage: ${ME} {start|stop|restart} [daemon ...]"
-       exit 2
-}
-
-if [ -z "$1" ]
-then
-       usage
-else
-       COMMAND=$1
-fi
-shift
-ARG_DAEMONS=$*
-BINDIR=/usr/sbin
-CONFDIR=/etc/quagga
-STATEDIR=/var/run/quagga
-DAEMONS="zebra ripd ripngd ospfd ospf6d bgpd"
-DAEMON_FLAGS=-d
-WATCHQUAGGA_FLAGS="-d -z -T 60 -R"
-WATCHQUAGGA_CMD="$0 watchrestart"
-if [ ${COMMAND} != "watchrestart" ]
-then
-       DAEMONS="${DAEMONS} watchquagga"
-fi
-DAEMONS_STARTSEQ=${DAEMONS}
-
-reverse()
-{
-       local revlist r
-        revlist=
-        for r
-       do
-                revlist="$r $revlist"
-        done
-        echo $revlist
-}
-
-DAEMONS_STOPSEQ=$(reverse ${DAEMONS_STARTSEQ})
-
-#pidof() {
-#      ps ax | awk 'match($5, "(^|/)'"$1"'$") > 0 { printf " %s", $1 }'
-#}
-
-quit() {
-       echo "${ME}: $1"
-       exit 0
-}
-
-die() {
-       echo "${ME}: $1"
-       exit 1
-}
-
-is_in() {
-       local i
-       for i in $2
-       do
-               [ "$1" = "$i" ] && return 0
-       done
-       return 1
+START=60
+start() {
+       /usr/sbin/quagga.init start
 }
 
-select_subset() {
-       local unknown i j
-       unknown=
-       RESULT=
-       for i in $1
-       do
-               is_in $i "$2" || unknown="$unknown $i"
-       done
-       if [ -n "$unknown" ]
-       then
-               RESULT=$unknown
-               return 1
-       else
-               for j in $2
-               do
-                       is_in $j "$1" && RESULT="$RESULT $j"
-               done
-               return 0
-       fi
+stop() {
+       /usr/sbin/quagga.init stop
 }
-
-# check command
-
-case ${COMMAND}
-in
-       start|stop|restart)
-               ;;
-       watchrestart)
-               if [ -n "$ARG_DAEMONS" ]
-               then
-                       echo "${ME}: watchrestart mode is only for use by watchquagga"
-                       exit 2
-               fi
-               ;;
-       *)
-               usage
-               ;;
-esac
-
-# select daemons to start
-
-case ${COMMAND}
-in
-       start|restart|watchrestart)
-               START_DAEMONS=
-               for d in ${DAEMONS_STARTSEQ}
-               do
-                       [ -x "${BINDIR}/${d}" -a -f "${CONFDIR}/${d}.conf" ] \
-                       && START_DAEMONS="${START_DAEMONS}${d} "
-               done
-               WATCHQUAGGA_DAEMONS=${START_DAEMONS}
-               if is_in watchquagga "${DAEMONS_STARTSEQ}"
-               then
-                       START_DAEMONS="${START_DAEMONS} watchquagga"
-               fi
-               if [ -n "${ARG_DAEMONS}" ]
-               then
-                       if select_subset "${ARG_DAEMONS}" "${DAEMONS}"
-                       then
-                               if select_subset "${ARG_DAEMONS}" "${START_DAEMONS}"
-                               then
-                                       START_DAEMONS=${RESULT}
-                               else
-                                       die "these daemons are not startable:${RESULT}."
-                               fi
-                       else
-                               die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
-                       fi
-               fi
-               ;;
-esac
-
-# select daemons to stop
-
-case ${COMMAND}
-in
-       stop|restart|watchrestart)
-               STOP_DAEMONS=${DAEMONS_STOPSEQ}
-               if [ -n "${ARG_DAEMONS}" ]
-               then
-                       if select_subset "${ARG_DAEMONS}" "${STOP_DAEMONS}"
-                       then
-                               STOP_DAEMONS=${RESULT}
-                       else
-                               die "unknown daemons:${RESULT}; choose from: ${DAEMONS}."
-                       fi
-               fi
-               stop_daemons=
-               for d in ${STOP_DAEMONS}
-               do
-                       pidfile=${STATEDIR}/${d}.pid
-                       if [ -f "${pidfile}" -o -n "$(pidof ${d})" ]
-                       then
-                               stop_daemons="${stop_daemons}${d} "
-                       elif [ -n "${ARG_DAEMONS}" ]
-                       then
-                               echo "${ME}: found no ${d} process running."
-                       fi
-               done
-               STOP_DAEMONS=${stop_daemons}
-               ;;
-esac
-
-# stop daemons
-
-for d in $STOP_DAEMONS
-do
-       echo -n "${ME}: Stopping ${d} ... "
-       pidfile=${STATEDIR}/${d}.pid
-       if [ -f "${pidfile}" ]
-       then
-               file_pid=$(cat ${pidfile})
-               if [ -z "${file_pid}" ]
-               then
-                       echo -n "no pid file entry found ... "
-               fi
-       else
-               file_pid=
-               echo -n "no pid file found ... "
-       fi
-       proc_pid=$(pidof ${d})
-       if [ -z "${proc_pid}" ]
-       then
-               echo -n "found no ${d} process running ... "
-       else
-               count=0
-               notinpidfile=
-               for p in ${proc_pid}
-               do
-                       count=$((${count}+1))
-                       if kill ${p}
-                       then
-                               echo -n "killed ${p} ... "
-                       else
-                               echo -n "failed to kill ${p} ... "
-                       fi
-                       [ "${p}" = "${file_pid}" ] \
-                       || notinpidfile="${notinpidfile} ${p}"
-               done
-               [ ${count} -le 1 ] \
-               || echo -n "WARNING: ${count} ${d} processes were found running ... "
-               for n in ${notinpidfile}
-               do
-                       echo -n "WARNING: process ${n} was not in pid file ... "
-               done
-       fi
-       count=0
-       survivors=$(pidof ${d})
-       while [ -n "${survivors}" ]
-       do
-               sleep 1
-               count=$((${count}+1))
-               survivors=$(pidof ${d})
-               [ -z "${survivors}" -o ${count} -gt 5 ] && break
-               for p in ${survivors}
-               do
-                       sleep 1
-                       echo -n "${p} "
-                       kill ${p}
-               done
-       done
-       survivors=$(pidof ${d})
-       [ -n "${survivors}" ] && \
-       if kill -KILL ${survivors}
-       then
-               echo -n "KILLed ${survivors} ... "
-       else
-               echo -n "failed to KILL ${survivors} ... "
-       fi
-       sleep 1
-       survivors=$(pidof ${d})
-       if [ -z "${survivors}" ]
-       then
-               echo -n "done."
-               if [ -f "${pidfile}" ]
-               then
-                       rm -f ${pidfile} \
-                       || echo -n " Failed to remove pidfile."
-               fi
-       else
-               echo -n "failed to stop ${survivors} - giving up."
-               if [ "${survivors}" != "${file_pid}" ]
-               then
-                       if echo "${survivors}" > ${pidfile}
-                       then
-                               chown quagga:quagga ${pidfile}
-                               echo -n " Wrote ${survivors} to pidfile."
-                       else
-                               echo -n " Failed to write ${survivors} to pidfile."
-                       fi
-               fi
-       fi
-       echo
-done
-
-# start daemons
-
-if [ -n "$START_DAEMONS" ]
-then
-       [ -d ${CONFDIR} ] \
-       || quit "${ME}: no config directory ${CONFDIR} - exiting."
-       chown -R quagga:quagga ${CONFDIR}
-       [ -d ${STATEDIR} ] || mkdir -p ${STATEDIR} \
-       || die "${ME}: could not create state directory ${STATEDIR} - exiting."
-       chown -R quagga:quagga ${STATEDIR}
-
-       for d in $START_DAEMONS
-       do
-               echo -n "${ME}: Starting ${d} ... "
-               proc_pid=$(pidof ${d})
-               pidfile=${STATEDIR}/${d}.pid
-               file_pid=
-               if [ -f "${pidfile}" ]
-               then
-                       file_pid=$(cat ${pidfile})
-                       if [ -n "${file_pid}" ]
-                       then
-                               echo -n "found old pid file entry ${file_pid} ... "
-                       fi
-               fi
-               if [ -n "${proc_pid}" ]
-               then
-                       echo -n "found ${d} running (${proc_pid}) - skipping ${d}."
-                       if [ "${proc_pid}" != "${file_pid}" ]
-                       then
-                               if echo "${proc_pid}" > ${pidfile}
-                               then
-                                       chown quagga:quagga ${pidfile}
-                                       echo -n " Wrote ${proc_pid} to pidfile."
-                               else
-                                       echo -n " Failed to write ${proc_pid} to pidfile."
-                               fi
-                       fi
-               elif rm -f "${pidfile}"
-               then
-                       if [ "${d}" = "watchquagga" ]
-                       then
-                               $("${BINDIR}/${d}" \
-                                       ${WATCHQUAGGA_FLAGS} \
-                                       "${WATCHQUAGGA_CMD}" \
-                                       ${WATCHQUAGGA_DAEMONS})
-                               status=$?
-                       else
-                               $("${BINDIR}/${d}" ${DAEMON_FLAGS})
-                               status=$?
-                       fi
-                       if [ $status -eq 0 ]
-                       then
-                               echo -n "done."
-                       else
-                               echo -n "failed."
-                       fi
-               else
-                       echo -n " failed to remove pidfile."
-               fi
-               echo
-       done
-fi
index 5f6778a..2ee47a2 100644 (file)
@@ -21,8 +21,6 @@ PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-PKG_INIT_PRIO=51
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/radvd
@@ -81,7 +79,7 @@ define Package/radvd/install
        install -d -m0755 $(1)/etc
        install -m0644 ./files/radvd.conf $(1)/etc/radvd.conf
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/radvd.init $(1)/etc/init.d/S$(PKG_INIT_PRIO)radvd
+       install -m0755 ./files/radvd.init $(1)/etc/init.d/radvd
        install -d -m0755 $(1)/usr/sbin
        install -m 755 $(PKG_INSTALL_DIR)/usr/sbin/radvd $(1)/usr/sbin/
        install -m 755 $(PKG_INSTALL_DIR)/usr/sbin/radvdump $(1)/usr/sbin/
index 38b1023..acaca47 100644 (file)
@@ -20,8 +20,6 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-PKG_INIT_PRIO:=50
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rarpd
@@ -60,7 +58,6 @@ define Package/rarpd/install
        install -m644 ./files/rarpd.default $(1)/etc/default/rarpd
        install -d -m0755 $(1)/etc/init.d
        install -m755 ./files/rarpd.init $(1)/etc/init.d/rarpd
-       ln -sf rarpd $(1)/etc/init.d/S$(PKG_INIT_PRIO)rarpd
 endef
 
 $(eval $(call BuildPackage,rarpd))
index 353a96a..bba2c85 100644 (file)
@@ -3,9 +3,9 @@
 
 RARPD=/usr/sbin/rarpd
 DEFAULT=/etc/default/rarpd
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        $RARPD $OPTIONS
 }
 stop() {
index bdf4bc5..3846871 100644 (file)
@@ -42,7 +42,6 @@ endef
 define Package/reaim/install   
        install -d -m0755 $(1)/etc/init.d
        install -m0755 ./files/reaim.init $(1)/etc/init.d/reaim
-       ln -sf reaim $(1)/etc/init.d/S63reaim
        install -d -m0755 $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(1)/usr/sbin/
 endef
index 8fe8c50..d6e8cb7 100644 (file)
@@ -1,16 +1,17 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=60
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 NAME=reaim
 DESC="Transparent proxy for IM behind NAT"
 IPT=/usr/sbin/iptables
 
-include /lib/network
-scan_interfaces
-config_get WAN wan ifname
-
 set_rules() {
+       include /lib/network
+       scan_interfaces
+       config_get WAN wan ifname
+
        [ -z "$WAN" ] && exit
        $IPT $1 input_rule -i $WAN -p tcp --dport 1863:1864 -j ACCEPT
        $IPT $1 input_rule -i $WAN -p tcp --dport 4443 -j ACCEPT
index 8051cfd..4895e17 100755 (executable)
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=60
 DEFAULT=/etc/default/rp-l2tpd
 RUN_D=/var/run
 [ -f $DEFAULT ] && . $DEFAULT
index 53878c3..21e0c44 100644 (file)
@@ -2,9 +2,9 @@
 # Copyright (C) 2006 OpenWrt.org
 
 DEFAULT=/etc/default/pppoe-relay
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        pppoe-relay $OPTIONS
 }
 
index b25f619..5e24be2 100644 (file)
@@ -2,9 +2,9 @@
 # Copyright (C) 2006 OpenWrt.org
 
 DEFAULT=/etc/default/pppoe-server
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        pppoe-server $OPTIONS
 }
 
index a30dfcf..504ce8a 100644 (file)
@@ -5,9 +5,9 @@ DEFAULT=/etc/default/samba
 RUN_D=/var/run/samba
 NMBD_PID_F=$RUN_D/nmbd.pid
 SMBD_PID_F=$RUN_D/smbd.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $RUN_D
        nmbd -D $NMBD_OPTIONS
        smbd -D $SMBD_OPTIONS
index dcdc4c3..573ff66 100644 (file)
@@ -60,7 +60,6 @@ define Package/scanlogd/install
        install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
        install -d -m0755 $(1)/etc/init.d
        install -m0755 ./files/scanlogd.init $(1)/etc/init.d/scanlogd
-       ln -sf scanlogd $(1)/etc/init.d/S$(PKG_INIT_PRIO)scanlogd
 endef
 
 $(eval $(call BuildPackage,scanlogd))
index 32b2ca9..9ae569b 100644 (file)
@@ -5,9 +5,9 @@ BIN=siproxd
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $RUN_D
        $BIN $OPTIONS
 }
index 595f378..22c9c97 100644 (file)
@@ -19,7 +19,6 @@ PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_INIT_LEVEL:=60
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,10 +41,9 @@ endef
 define Package/srelay/install  
        install -m0755 -d $(1)/usr/bin
        install -m0755 -d $(1)/etc/init.d
-       $(CP) $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/
-       $(CP) files/srelay.init $(1)/etc/init.d/S$(PKG_INIT_LEVEL)srelay
-       $(CP) files/srelay.conf $(1)/etc
-       chmod 755 $(1)/etc/init.d/S$(PKG_INIT_LEVEL)srelay
+       install -m0755 $(PKG_BUILD_DIR)/srelay $(1)/usr/bin/
+       install -m0755 files/srelay.init $(1)/etc/init.d/srelay
+       install -m0644 files/srelay.conf $(1)/etc
 endef
 
 $(eval $(call BuildPackage,srelay))
index 389c238..1347bfc 100644 (file)
@@ -5,11 +5,11 @@ BIN=tinyproxy
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
-        mkdir -p $RUN_D
-        $BIN $OPTIONS
+       [ -f $DEFAULT ] && . $DEFAULT
+    mkdir -p $RUN_D
+    $BIN $OPTIONS
 }
 
 stop() {
index 5de8663..b64fe8b 100644 (file)
@@ -6,9 +6,9 @@ DEFAULT=/etc/default/$BIN
 LOG_D=/var/log/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $LOG_D
        mkdir -p $RUN_D
        $BIN $OPTIONS
index 8d3d177..27f942c 100644 (file)
@@ -114,7 +114,6 @@ define Package/ulogd/install
        install -m0644 ./files/ulogd.default $(1)/etc/default/ulogd
        install -d -m0755 $(1)/etc/init.d
        install -m0755 ./files/ulogd.init $(1)/etc/init.d/ulogd
-       ln -sf ulogd $(1)/etc/init.d/S49ulogd
        install -d -m0755 $(1)/usr/lib/ulogd
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(1)/usr/lib/ulogd/
        install -d -m0755 $(1)/usr/sbin
index 61a0879..cb7d080 100644 (file)
@@ -4,9 +4,9 @@
 BIN=ulogd
 DEFAULT=/etc/default/$BIN
 LOG_D=/var/log
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        $BIN $OPTIONS
 }
 
index 100d6da..79f220e 100644 (file)
@@ -29,7 +29,7 @@ define Package/updatedd
   TITLE:=A tool to update dynamic dns services
   DESCRIPTION:=Updatedd is a small tool that will update one of many dynamic\\\
   dns services on boot.\\\
-  Please look at the /etc/init.d/S55ddns script for more info.\\\
+  Please look at the /etc/init.d/ddns script for more info.\\\
   URL:=http://www.philipp-benner.de/updatedd/
 endef
 
@@ -112,7 +112,7 @@ endef
 
 define Package/updatedd/install
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/S55ddns $(1)/etc/init.d/
+       install -m0755 ./files/ddns.init $(1)/etc/init.d/ddns
        install -d -m0755 $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/updatedd $(1)/usr/bin/
        install -d -m0755 $(1)/usr/lib/updatedd
diff --git a/net/updatedd/files/S55ddns b/net/updatedd/files/S55ddns
deleted file mode 100644 (file)
index faaccb5..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-start() {
-       . /etc/nvram.sh
-       
-       ddnsupdate=$(nvram get ddns_update)
-       [ "$ddnsupdate" = 1 ]&& {
-               service=$(nvram get ddns_service)
-               uname=$(nvram get ddns_user)
-               passwd=$(nvram get ddns_password)
-               host=$(nvram get ddns_host)
-       
-               /usr/bin/updatedd -Y $service -- $uname:$passwd $host
-       }
-}
-
-stop() {
-       killall updatedd
-}
diff --git a/net/updatedd/files/ddns.init b/net/updatedd/files/ddns.init
new file mode 100644 (file)
index 0000000..faaccb5
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+start() {
+       . /etc/nvram.sh
+       
+       ddnsupdate=$(nvram get ddns_update)
+       [ "$ddnsupdate" = 1 ]&& {
+               service=$(nvram get ddns_service)
+               uname=$(nvram get ddns_user)
+               passwd=$(nvram get ddns_password)
+               host=$(nvram get ddns_host)
+       
+               /usr/bin/updatedd -Y $service -- $uname:$passwd $host
+       }
+}
+
+stop() {
+       killall updatedd
+}
index 64d686f..ff6d53a 100644 (file)
@@ -3,11 +3,11 @@
 
 BIN=vrrpd
 DEFAULT=/etc/default/$BIN
-[ -f $DEFAULT ] && . $DEFAULT
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN_${IF}_${ID}.pid
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        $BIN $OPTIONS
 }
 
index 716f66d..45e0421 100644 (file)
@@ -55,7 +55,7 @@ endef
        
 define Package/wifidog/install
        install -m0755 -d $(1)/etc/init.d
-       install -m0755 ./files/$(PKG_NAME).init $(1)/etc/init.d/S65wifidog
+       install -m0755 ./files/$(PKG_NAME).init $(1)/etc/init.d/wifidog
        install -m0644 ./files/wifidog.conf $(1)/etc/
        install -m0755 -d $(1)/usr/bin
        install -m0755 -d $(1)/usr/lib
index 4041192..8ca59b9 100644 (file)
@@ -4,9 +4,9 @@
 DEFAULT=/etc/default/xinetd
 RUN_D=/var/run
 PID_F=$RUN_D/xinetd.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $RUN_D ] || mkdir -p $RUN_D
        xinetd $OPTIONS
 }
index 344621a..460824e 100644 (file)
@@ -5,9 +5,9 @@ BIN=mt-daapd
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
 PID_F=$RUN_D/$BIN.pid
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       [ -f $DEFAULT ] && . $DEFAULT
        [ -d $RUN_D ] || mkdir -p $RUN_D
        $BIN $OPTIONS
 }
index 47c5a6b..71d0ce6 100644 (file)
@@ -30,25 +30,25 @@ define Package/collectd
 endef
 
 define Build/Compile
-$(call Build/Configure/Default,--enable-shared \
---disable-static \
---disable-debug \
---enable-cpu \
---enable-load \
---enable-memory \
---enable-ping \
---enable-traffic \
---disable-cpufreq \
---disable-disk \
---disable-hddtemp \
---disable-nfs \
---disable-processes \
---disable-sensors \
---disable-serial \
---disable-swap \
---disable-tape \
---disable-users \
-)
+       $(call Build/Configure/Default,--enable-shared \
+               --disable-static \
+               --disable-debug \
+               --enable-cpu \
+               --enable-load \
+               --enable-memory \
+               --enable-ping \
+               --enable-traffic \
+               --disable-cpufreq \
+               --disable-disk \
+               --disable-hddtemp \
+               --disable-nfs \
+               --disable-processes \
+               --disable-sensors \
+               --disable-serial \
+               --disable-swap \
+               --disable-tape \
+               --disable-users \
+       )
 endef
 
 define Build/Compile
@@ -65,7 +65,7 @@ define Package/collectd/install
        install -d -m0755 $(1)/usr/lib/collectd
        install -d -m0755 $(1)/var/lib/collectd
        install -d -m0755 $(1)/var/run
-       install -m0755 ./files/S80collectd $(1)/etc/init.d/
+       install -m0755 ./files/collectd.init $(1)/etc/init.d/collectd
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(1)/usr/sbin/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(1)/usr/lib/collectd/
 endef
diff --git a/utils/collectd/files/S80collectd b/utils/collectd/files/S80collectd
deleted file mode 100755 (executable)
index f35e4f5..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-BINARY="/usr/sbin/collectd"
-PIDFILE="/var/run/collectd.pid"
-DATADIR="/var/lib/collectd"
-
-start() {
-       [ -x "$BINARY" ] || exit 1;
-
-       if [ -e "$PIDFILE" ]
-       then
-               kill $(cat "$PIDFILE") 2>/dev/null
-               sleep 1
-       fi
-
-       [ -d "$DATADIR" ] || mkdir -p "$DATADIR";
-
-       $BINARY
-}
-
-stop() {
-       kill $(cat "$PIDFILE") 2>/dev/null
-}
diff --git a/utils/collectd/files/collectd.init b/utils/collectd/files/collectd.init
new file mode 100755 (executable)
index 0000000..34886f7
--- /dev/null
@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+
+START=80
+BINARY="/usr/sbin/collectd"
+PIDFILE="/var/run/collectd.pid"
+DATADIR="/var/lib/collectd"
+
+start() {
+       [ -x "$BINARY" ] || exit 1;
+
+       if [ -e "$PIDFILE" ]
+       then
+               kill $(cat "$PIDFILE") 2>/dev/null
+               sleep 1
+       fi
+
+       [ -d "$DATADIR" ] || mkdir -p "$DATADIR";
+
+       $BINARY
+}
+
+stop() {
+       kill $(cat "$PIDFILE") 2>/dev/null
+}
index f0604d4..a38d07d 100644 (file)
@@ -93,7 +93,7 @@ define Package/rrdcollect-example/install
        install -m0644 ./files/rrd.conf $(1)/etc/
        install -m0644 ./files/rrdcollect.conf $(1)/etc/
        install -d -m0755 $(1)/etc/init.d
-       install -m0755 ./files/rrdcollect.init $(1)/etc/init.d/S98rrdcollect
+       install -m0755 ./files/rrdcollect.init $(1)/etc/init.d/rrdcollect
        install -d -m0755 $(1)/usr/bin
        install -m0755 ./files/rrd.sh $(1)/usr/bin/
        install -d -m0755 $(1)/www/cgi-bin
index 8fa4521..42943bd 100644 (file)
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
+START=98
 BIN=rrdcollect
 DEFAULT=/etc/default/$BIN
 RUN_D=/var/run
@@ -9,10 +10,10 @@ LIB_D=/var/lib/rrdcollect
 CGI_S=$LIB_D/rrd.cgi
 IMG_D=$LIB_D/img
 RRD_D=$LIB_D/rrd
-RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null)
-[ -f $DEFAULT ] && . $DEFAULT
 
 start() {
+       RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null)
+       [ -f $DEFAULT ] && . $DEFAULT
        mkdir -p $RUN_D
        mkdir -p $IMG_D
        mkdir -p $RRD_D
index 3dc820f..7b87b95 100644 (file)
@@ -18,8 +18,6 @@ PKG_SOURCE_URL:=@SF/setserial
 PKG_MD5SUM:=c4867d72c41564318e0107745eb7a0f2
 PKG_CAT:=zcat
 
-PKG_INIT_PRIO=15
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/setserial
@@ -69,7 +67,7 @@ endef
 define Package/setserial/install
        install -d -m0755 $(1)/etc/init.d
        install -m0755 ./files/serial.init $(1)/etc/init.d/setserial
-       ln -sf setserial $(1)/etc/init.d/S$(PKG_INIT_PRIO)setserial
+       ln -sf setserial $(1)/etc/init.d/setserial
        install -d -m0755 $(1)/usr/sbin
        install -m0755 $(PKG_BUILD_DIR)/setserial $(1)/usr/sbin/
 endef
index 77caae3..f9cd0e8 100644 (file)
@@ -1,6 +1,7 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-start() {
+START=15
+boot() {
        /usr/sbin/setserial /dev/tts/1 irq 3
 }