From 1f75d5501cb34f16404df265874bb341e0daba2e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 15 Oct 2006 21:03:30 +0000 Subject: [PATCH] init script cleanup, use /etc/rc.d/ for enabled scripts, /etc/init.d/ (enable|disable) manages symlinks SVN-Revision: 5128 --- admin/monit/files/monit.init | 2 +- admin/osiris/files/osirisd.init | 2 +- admin/syslog-ng/Makefile | 3 +- ipv6/mrd6/Makefile | 2 +- lang/php4/files/php.init | 24 +- libs/avahi/files/avahi-daemon.init | 2 +- libs/howl/files/autoipd.init | 2 +- libs/howl/files/mDNSResponder.init | 2 +- libs/howl/files/nifd.init | 2 +- libs/net-snmp/files/snmpd.init | 2 +- multimedia/peercast/Makefile | 1 - net/aiccu/Makefile | 2 +- net/asterisk/Makefile | 6 +- net/asterisk/files/asterisk.init | 30 +- net/bind/Makefile | 2 +- net/bitchx/Makefile | 4 +- .../files/{S98bitchxrc => bitchxrc.init} | 1 + net/bitlbee/Makefile | 3 +- .../files/{S55bitlbee => bitlbee.init} | 0 net/click/Makefile | 2 +- net/click/files/{S50roofnet => roofnet.init} | 0 net/cups/Makefile | 2 +- net/freeradius/files/radiusd.init | 2 +- net/gmediaserver/files/gmediaserver.init | 2 +- net/htpdate/Makefile | 2 +- net/htpdate/files/htpdate.init | 3 +- net/l2tpd/files/l2tpd.init | 3 +- net/lighttpd/files/lighttpd.init | 2 +- net/maradns/Makefile | 2 +- net/miau/Makefile | 2 +- net/miau/files/{S50miau => miau.init} | 0 net/miredo/files/miredo-server.init | 2 +- net/miredo/files/miredo.init | 2 +- net/netperf/Makefile | 2 +- net/nfs-kernel-server/Makefile | 2 +- net/nfs-kernel-server/files/nfsd.init | 1 + net/nfs-server/Makefile | 2 +- net/oidentd/Makefile | 2 +- .../files/{S85oidentd => oidentd.init} | 1 + net/olsrd/Makefile | 2 +- net/olsrd/files/olsrd.init | 2 +- net/openntpd/Makefile | 2 +- net/openntpd/files/ntpd.init | 1 + net/openssh/Makefile | 2 +- net/openssh/files/{S50sshd => sshd.init} | 0 net/p910nd/Makefile | 1 - net/parprouted/Makefile | 1 - net/parprouted/files/parprouted.init | 2 +- net/peerguardian/files/peerguardian.init | 2 +- net/portmap/Makefile | 1 - net/portmap/files/portmap.init | 3 +- net/pptpd/Makefile | 2 +- net/pptpd/files/pptpd.init | 3 +- net/quagga/Makefile | 2 +- net/quagga/files/quagga | 333 +++++++++++++++++ net/quagga/files/quagga.init | 336 +----------------- net/radvd/Makefile | 4 +- net/rarpd/Makefile | 3 - net/rarpd/files/rarpd.init | 2 +- net/reaim/Makefile | 1 - net/reaim/files/reaim.init | 9 +- net/rp-l2tp/files/rp-l2tpd.init | 1 + net/rp-pppoe/files/pppoe-relay.init | 2 +- net/rp-pppoe/files/pppoe-server.init | 2 +- net/samba/files/samba.init | 2 +- net/scanlogd/Makefile | 1 - net/siproxd/files/siproxd.init | 2 +- net/srelay/Makefile | 8 +- net/tinyproxy/files/tinyproxy.init | 6 +- net/tor/files/tor.init | 2 +- net/ulogd/Makefile | 1 - net/ulogd/files/ulogd.init | 2 +- net/updatedd/Makefile | 4 +- net/updatedd/files/{S55ddns => ddns.init} | 0 net/vrrpd/files/vrrpd.init | 2 +- net/wifidog/Makefile | 2 +- net/xinetd/files/xinetd.init | 2 +- sound/mt-daapd/files/mt-daapd.init | 2 +- utils/collectd/Makefile | 40 +-- .../files/{S80collectd => collectd.init} | 1 + utils/rrdcollect/Makefile | 2 +- utils/rrdcollect/files/rrdcollect.init | 5 +- utils/setserial/Makefile | 4 +- utils/setserial/files/serial.init | 3 +- 84 files changed, 464 insertions(+), 474 deletions(-) rename net/bitchx/files/{S98bitchxrc => bitchxrc.init} (95%) rename net/bitlbee/files/{S55bitlbee => bitlbee.init} (100%) rename net/click/files/{S50roofnet => roofnet.init} (100%) rename net/miau/files/{S50miau => miau.init} (100%) rename net/oidentd/files/{S85oidentd => oidentd.init} (93%) rename net/openssh/files/{S50sshd => sshd.init} (100%) create mode 100644 net/quagga/files/quagga rename net/updatedd/files/{S55ddns => ddns.init} (100%) rename utils/collectd/files/{S80collectd => collectd.init} (97%) diff --git a/admin/monit/files/monit.init b/admin/monit/files/monit.init index 11eb303129..c47f4da351 100644 --- a/admin/monit/files/monit.init +++ b/admin/monit/files/monit.init @@ -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 } diff --git a/admin/osiris/files/osirisd.init b/admin/osiris/files/osirisd.init index 0fc6e76c18..9854f3431b 100644 --- a/admin/osiris/files/osirisd.init +++ b/admin/osiris/files/osirisd.init @@ -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 diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index 1ef4e72f49..723c3de587 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -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 diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile index aab01e41e7..3d8435e2e3 100644 --- a/ipv6/mrd6/Makefile +++ b/ipv6/mrd6/Makefile @@ -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)) diff --git a/lang/php4/files/php.init b/lang/php4/files/php.init index b29387bd74..9cf369169a 100644 --- a/lang/php4/files/php.init +++ b/lang/php4/files/php.init @@ -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 $? diff --git a/libs/avahi/files/avahi-daemon.init b/libs/avahi/files/avahi-daemon.init index 81ceb9b939..f8bee67090 100644 --- a/libs/avahi/files/avahi-daemon.init +++ b/libs/avahi/files/avahi-daemon.init @@ -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 } diff --git a/libs/howl/files/autoipd.init b/libs/howl/files/autoipd.init index 3de6e6e23a..7967153484 100644 --- a/libs/howl/files/autoipd.init +++ b/libs/howl/files/autoipd.init @@ -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 } diff --git a/libs/howl/files/mDNSResponder.init b/libs/howl/files/mDNSResponder.init index aae87c32de..415caae7df 100644 --- a/libs/howl/files/mDNSResponder.init +++ b/libs/howl/files/mDNSResponder.init @@ -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 } diff --git a/libs/howl/files/nifd.init b/libs/howl/files/nifd.init index 0569e68a22..59a3f3bc3c 100644 --- a/libs/howl/files/nifd.init +++ b/libs/howl/files/nifd.init @@ -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 } diff --git a/libs/net-snmp/files/snmpd.init b/libs/net-snmp/files/snmpd.init index 42af3f7aa3..d3206e722d 100644 --- a/libs/net-snmp/files/snmpd.init +++ b/libs/net-snmp/files/snmpd.init @@ -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 diff --git a/multimedia/peercast/Makefile b/multimedia/peercast/Makefile index aec2c0944f..676fd86645 100644 --- a/multimedia/peercast/Makefile +++ b/multimedia/peercast/Makefile @@ -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)) diff --git a/net/aiccu/Makefile b/net/aiccu/Makefile index 9d2242e47e..c0b4b3a649 100644 --- a/net/aiccu/Makefile +++ b/net/aiccu/Makefile @@ -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 diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 1df0c676f7..5ba984670b 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -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 diff --git a/net/asterisk/files/asterisk.init b/net/asterisk/files/asterisk.init index 698c3dfa82..1c97a18dfa 100644 --- a/net/asterisk/files/asterisk.init +++ b/net/asterisk/files/asterisk.init @@ -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 +} diff --git a/net/bind/Makefile b/net/bind/Makefile index 808949e98f..19812c408a 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -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 diff --git a/net/bitchx/Makefile b/net/bitchx/Makefile index a355e70ef5..bfd6370d81 100644 --- a/net/bitchx/Makefile +++ b/net/bitchx/Makefile @@ -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/bitchxrc.init similarity index 95% rename from net/bitchx/files/S98bitchxrc rename to net/bitchx/files/bitchxrc.init index eda8a03a63..e5966d3f47 100755 --- a/net/bitchx/files/S98bitchxrc +++ b/net/bitchx/files/bitchxrc.init @@ -1,5 +1,6 @@ #!/bin/sh /etc/rc.common +START=98 start() { # make /tmp/.bitchxrc as many servers ban root if [ ! -e /tmp/.bitchxrc ] diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index de6ede36d1..ad7ee36f82 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -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/bitlbee.init similarity index 100% rename from net/bitlbee/files/S55bitlbee rename to net/bitlbee/files/bitlbee.init diff --git a/net/click/Makefile b/net/click/Makefile index 4e88b31ac2..cfa49e8354 100644 --- a/net/click/Makefile +++ b/net/click/Makefile @@ -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/roofnet.init similarity index 100% rename from net/click/files/S50roofnet rename to net/click/files/roofnet.init diff --git a/net/cups/Makefile b/net/cups/Makefile index 3e51a83226..a8852985ef 100644 --- a/net/cups/Makefile +++ b/net/cups/Makefile @@ -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 diff --git a/net/freeradius/files/radiusd.init b/net/freeradius/files/radiusd.init index cfb2ff8b11..4b5cdcee6a 100644 --- a/net/freeradius/files/radiusd.init +++ b/net/freeradius/files/radiusd.init @@ -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 diff --git a/net/gmediaserver/files/gmediaserver.init b/net/gmediaserver/files/gmediaserver.init index 71ffa8d235..f9e3705caa 100644 --- a/net/gmediaserver/files/gmediaserver.init +++ b/net/gmediaserver/files/gmediaserver.init @@ -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 } diff --git a/net/htpdate/Makefile b/net/htpdate/Makefile index 05354c68ba..61449f91e4 100644 --- a/net/htpdate/Makefile +++ b/net/htpdate/Makefile @@ -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 diff --git a/net/htpdate/files/htpdate.init b/net/htpdate/files/htpdate.init index 97ec97d4f7..1409321df9 100644 --- a/net/htpdate/files/htpdate.init +++ b/net/htpdate/files/htpdate.init @@ -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 } diff --git a/net/l2tpd/files/l2tpd.init b/net/l2tpd/files/l2tpd.init index eeecae51d1..7549c1981a 100644 --- a/net/l2tpd/files/l2tpd.init +++ b/net/l2tpd/files/l2tpd.init @@ -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 } diff --git a/net/lighttpd/files/lighttpd.init b/net/lighttpd/files/lighttpd.init index 3e46924e83..fe0ca2290c 100644 --- a/net/lighttpd/files/lighttpd.init +++ b/net/lighttpd/files/lighttpd.init @@ -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 diff --git a/net/maradns/Makefile b/net/maradns/Makefile index d807ad39c6..79ea02c8be 100644 --- a/net/maradns/Makefile +++ b/net/maradns/Makefile @@ -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 diff --git a/net/miau/Makefile b/net/miau/Makefile index 3afa9de2ea..5b59cb0d0e 100644 --- a/net/miau/Makefile +++ b/net/miau/Makefile @@ -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/miau.init similarity index 100% rename from net/miau/files/S50miau rename to net/miau/files/miau.init diff --git a/net/miredo/files/miredo-server.init b/net/miredo/files/miredo-server.init index b050b5572b..d8c3d4c305 100644 --- a/net/miredo/files/miredo-server.init +++ b/net/miredo/files/miredo-server.init @@ -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 diff --git a/net/miredo/files/miredo.init b/net/miredo/files/miredo.init index 7fe13d963f..dbf46a6d6c 100644 --- a/net/miredo/files/miredo.init +++ b/net/miredo/files/miredo.init @@ -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 diff --git a/net/netperf/Makefile b/net/netperf/Makefile index 134d3d5486..add3136d66 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -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/ diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index cae589f679..b16107a99a 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -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 diff --git a/net/nfs-kernel-server/files/nfsd.init b/net/nfs-kernel-server/files/nfsd.init index 21adf5b291..cb4bae5f6a 100644 --- a/net/nfs-kernel-server/files/nfsd.init +++ b/net/nfs-kernel-server/files/nfsd.init @@ -1,6 +1,7 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org +START=60 NFS_D=/var/lib/nfs start() { diff --git a/net/nfs-server/Makefile b/net/nfs-server/Makefile index 3132f12dc0..c66aa373ca 100644 --- a/net/nfs-server/Makefile +++ b/net/nfs-server/Makefile @@ -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 diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile index 64a8305b15..b951305ce1 100644 --- a/net/oidentd/Makefile +++ b/net/oidentd/Makefile @@ -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/oidentd.init similarity index 93% rename from net/oidentd/files/S85oidentd rename to net/oidentd/files/oidentd.init index a2c04b786c..2bdc34df69 100755 --- a/net/oidentd/files/S85oidentd +++ b/net/oidentd/files/oidentd.init @@ -1,6 +1,7 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org +START=85 start() { /usr/sbin/oidentd -m -f 113 } diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile index d9b9c8c4f1..ea857700bc 100644 --- a/net/olsrd/Makefile +++ b/net/olsrd/Makefile @@ -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 diff --git a/net/olsrd/files/olsrd.init b/net/olsrd/files/olsrd.init index f59ff7ef88..3cdd6ae159 100644 --- a/net/olsrd/files/olsrd.init +++ b/net/olsrd/files/olsrd.init @@ -2,9 +2,9 @@ # Copyright (C) 2006 OpenWrt.org DEFAULT=/etc/default/olsrd -[ -f $DEFAULT ] && . $DEFAULT start() { + [ -f $DEFAULT ] && . $DEFAULT olsrd $OPTIONS } diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index 35c1994319..0f859b3914 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -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 diff --git a/net/openntpd/files/ntpd.init b/net/openntpd/files/ntpd.init index e680f62c35..2fc4bb8adf 100644 --- a/net/openntpd/files/ntpd.init +++ b/net/openntpd/files/ntpd.init @@ -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 diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 32a6359463..de806a5b42 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -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/sshd.init similarity index 100% rename from net/openssh/files/S50sshd rename to net/openssh/files/sshd.init diff --git a/net/p910nd/Makefile b/net/p910nd/Makefile index 87e04d4453..a023d6d0ce 100644 --- a/net/p910nd/Makefile +++ b/net/p910nd/Makefile @@ -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 diff --git a/net/parprouted/Makefile b/net/parprouted/Makefile index 9fd309a8e3..d9456de56c 100644 --- a/net/parprouted/Makefile +++ b/net/parprouted/Makefile @@ -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 diff --git a/net/parprouted/files/parprouted.init b/net/parprouted/files/parprouted.init index aae46fc68c..b0911b6b88 100755 --- a/net/parprouted/files/parprouted.init +++ b/net/parprouted/files/parprouted.init @@ -3,9 +3,9 @@ BIN=parprouted DEFAULT=/etc/default/$BIN -[ -f $DEFAULT ] && . $DEFAULT start() { + [ -f $DEFAULT ] && . $DEFAULT $BIN $OPTIONS } diff --git a/net/peerguardian/files/peerguardian.init b/net/peerguardian/files/peerguardian.init index cd786b89e9..45f1511522 100644 --- a/net/peerguardian/files/peerguardian.init +++ b/net/peerguardian/files/peerguardian.init @@ -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 } diff --git a/net/portmap/Makefile b/net/portmap/Makefile index 05b19c4471..562ff291a8 100644 --- a/net/portmap/Makefile +++ b/net/portmap/Makefile @@ -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 diff --git a/net/portmap/files/portmap.init b/net/portmap/files/portmap.init index fd4be73535..3bbfb573f8 100644 --- a/net/portmap/files/portmap.init +++ b/net/portmap/files/portmap.init @@ -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 } diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile index 0e5bb127f5..4972024068 100644 --- a/net/pptpd/Makefile +++ b/net/pptpd/Makefile @@ -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 diff --git a/net/pptpd/files/pptpd.init b/net/pptpd/files/pptpd.init index 40e4d7e65a..a74973ce25 100644 --- a/net/pptpd/files/pptpd.init +++ b/net/pptpd/files/pptpd.init @@ -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 diff --git a/net/quagga/Makefile b/net/quagga/Makefile index eb733bcbef..33bb2e1727 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -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 index 0000000000..01f8d7137d --- /dev/null +++ b/net/quagga/files/quagga @@ -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 diff --git a/net/quagga/files/quagga.init b/net/quagga/files/quagga.init index 01f8d7137d..21fbf2c3ab 100644 --- a/net/quagga/files/quagga.init +++ b/net/quagga/files/quagga.init @@ -1,333 +1,11 @@ -#!/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 diff --git a/net/radvd/Makefile b/net/radvd/Makefile index 5f6778a712..2ee47a20d5 100644 --- a/net/radvd/Makefile +++ b/net/radvd/Makefile @@ -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/ diff --git a/net/rarpd/Makefile b/net/rarpd/Makefile index 38b1023139..acaca47f42 100644 --- a/net/rarpd/Makefile +++ b/net/rarpd/Makefile @@ -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)) diff --git a/net/rarpd/files/rarpd.init b/net/rarpd/files/rarpd.init index 353a96acb2..bba2c858e2 100644 --- a/net/rarpd/files/rarpd.init +++ b/net/rarpd/files/rarpd.init @@ -3,9 +3,9 @@ RARPD=/usr/sbin/rarpd DEFAULT=/etc/default/rarpd -[ -f $DEFAULT ] && . $DEFAULT start() { + [ -f $DEFAULT ] && . $DEFAULT $RARPD $OPTIONS } stop() { diff --git a/net/reaim/Makefile b/net/reaim/Makefile index bdf4bc5d05..3846871633 100644 --- a/net/reaim/Makefile +++ b/net/reaim/Makefile @@ -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 diff --git a/net/reaim/files/reaim.init b/net/reaim/files/reaim.init index 8fe8c50f33..d6e8cb72d3 100644 --- a/net/reaim/files/reaim.init +++ b/net/reaim/files/reaim.init @@ -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 diff --git a/net/rp-l2tp/files/rp-l2tpd.init b/net/rp-l2tp/files/rp-l2tpd.init index 8051cfd596..4895e17943 100755 --- a/net/rp-l2tp/files/rp-l2tpd.init +++ b/net/rp-l2tp/files/rp-l2tpd.init @@ -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 diff --git a/net/rp-pppoe/files/pppoe-relay.init b/net/rp-pppoe/files/pppoe-relay.init index 53878c3026..21e0c44c85 100644 --- a/net/rp-pppoe/files/pppoe-relay.init +++ b/net/rp-pppoe/files/pppoe-relay.init @@ -2,9 +2,9 @@ # Copyright (C) 2006 OpenWrt.org DEFAULT=/etc/default/pppoe-relay -[ -f $DEFAULT ] && . $DEFAULT start() { + [ -f $DEFAULT ] && . $DEFAULT pppoe-relay $OPTIONS } diff --git a/net/rp-pppoe/files/pppoe-server.init b/net/rp-pppoe/files/pppoe-server.init index b25f61974d..5e24be21fa 100644 --- a/net/rp-pppoe/files/pppoe-server.init +++ b/net/rp-pppoe/files/pppoe-server.init @@ -2,9 +2,9 @@ # Copyright (C) 2006 OpenWrt.org DEFAULT=/etc/default/pppoe-server -[ -f $DEFAULT ] && . $DEFAULT start() { + [ -f $DEFAULT ] && . $DEFAULT pppoe-server $OPTIONS } diff --git a/net/samba/files/samba.init b/net/samba/files/samba.init index a30dfcf46e..504ce8a605 100644 --- a/net/samba/files/samba.init +++ b/net/samba/files/samba.init @@ -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 diff --git a/net/scanlogd/Makefile b/net/scanlogd/Makefile index dcdc4c39be..573ff668d3 100644 --- a/net/scanlogd/Makefile +++ b/net/scanlogd/Makefile @@ -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)) diff --git a/net/siproxd/files/siproxd.init b/net/siproxd/files/siproxd.init index 32b2ca94f6..9ae569b66c 100644 --- a/net/siproxd/files/siproxd.init +++ b/net/siproxd/files/siproxd.init @@ -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 } diff --git a/net/srelay/Makefile b/net/srelay/Makefile index 595f37817d..22c9c97b57 100644 --- a/net/srelay/Makefile +++ b/net/srelay/Makefile @@ -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)) diff --git a/net/tinyproxy/files/tinyproxy.init b/net/tinyproxy/files/tinyproxy.init index 389c2385f9..1347bfc88d 100644 --- a/net/tinyproxy/files/tinyproxy.init +++ b/net/tinyproxy/files/tinyproxy.init @@ -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() { diff --git a/net/tor/files/tor.init b/net/tor/files/tor.init index 5de8663148..b64fe8bd98 100644 --- a/net/tor/files/tor.init +++ b/net/tor/files/tor.init @@ -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 diff --git a/net/ulogd/Makefile b/net/ulogd/Makefile index 8d3d177482..27f942ce0e 100644 --- a/net/ulogd/Makefile +++ b/net/ulogd/Makefile @@ -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 diff --git a/net/ulogd/files/ulogd.init b/net/ulogd/files/ulogd.init index 61a0879401..cb7d08015d 100644 --- a/net/ulogd/files/ulogd.init +++ b/net/ulogd/files/ulogd.init @@ -4,9 +4,9 @@ BIN=ulogd DEFAULT=/etc/default/$BIN LOG_D=/var/log -[ -f $DEFAULT ] && . $DEFAULT start() { + [ -f $DEFAULT ] && . $DEFAULT $BIN $OPTIONS } diff --git a/net/updatedd/Makefile b/net/updatedd/Makefile index 100d6da53a..79f220e1f5 100644 --- a/net/updatedd/Makefile +++ b/net/updatedd/Makefile @@ -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/ddns.init similarity index 100% rename from net/updatedd/files/S55ddns rename to net/updatedd/files/ddns.init diff --git a/net/vrrpd/files/vrrpd.init b/net/vrrpd/files/vrrpd.init index 64d686f67c..ff6d53a5e9 100644 --- a/net/vrrpd/files/vrrpd.init +++ b/net/vrrpd/files/vrrpd.init @@ -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 } diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile index 716f66d8fa..45e042141d 100644 --- a/net/wifidog/Makefile +++ b/net/wifidog/Makefile @@ -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 diff --git a/net/xinetd/files/xinetd.init b/net/xinetd/files/xinetd.init index 40411926a5..8ca59b93f8 100644 --- a/net/xinetd/files/xinetd.init +++ b/net/xinetd/files/xinetd.init @@ -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 } diff --git a/sound/mt-daapd/files/mt-daapd.init b/sound/mt-daapd/files/mt-daapd.init index 344621a41a..460824ef6c 100644 --- a/sound/mt-daapd/files/mt-daapd.init +++ b/sound/mt-daapd/files/mt-daapd.init @@ -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 } diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 47c5a6bd2c..71d0ce6a53 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -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/collectd.init similarity index 97% rename from utils/collectd/files/S80collectd rename to utils/collectd/files/collectd.init index f35e4f50f1..34886f7a6f 100755 --- a/utils/collectd/files/S80collectd +++ b/utils/collectd/files/collectd.init @@ -1,6 +1,7 @@ #!/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" diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile index f0604d4326..a38d07d740 100644 --- a/utils/rrdcollect/Makefile +++ b/utils/rrdcollect/Makefile @@ -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 diff --git a/utils/rrdcollect/files/rrdcollect.init b/utils/rrdcollect/files/rrdcollect.init index 8fa4521cb5..42943bd717 100644 --- a/utils/rrdcollect/files/rrdcollect.init +++ b/utils/rrdcollect/files/rrdcollect.init @@ -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 diff --git a/utils/setserial/Makefile b/utils/setserial/Makefile index 3dc820faca..7b87b95c37 100644 --- a/utils/setserial/Makefile +++ b/utils/setserial/Makefile @@ -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 diff --git a/utils/setserial/files/serial.init b/utils/setserial/files/serial.init index 77caae3a6d..f9cd0e84f7 100644 --- a/utils/setserial/files/serial.init +++ b/utils/setserial/files/serial.init @@ -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 } -- 2.30.2