add new rc.common for standardized init scripts, convert existing init scripts

SVN-Revision: 4915

openwrt/package/base-files/ar7-2.4/etc/init.d/S00adam2

@@ -1,8 +1,12 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # ADAM2 patcher for Netgear DG834 and compatible
-MD5="$(md5sum /dev/mtdblock/0  | awk '{print $1}')"
+# Copyright (C) 2006 OpenWrt.org
-[ "$MD5" = "0530bfdf00ec155f4182afd70da028c1" ] && {
+
+start() {
+	MD5="$(md5sum /dev/mtdblock/0  | awk '{print $1}')"
+	[ "$MD5" = "0530bfdf00ec155f4182afd70da028c1" ] && {
 		mtd unlock adam2
 		/sbin/adam2patcher /dev/mtdblock/0
+	}
+	rm -f /etc/init.d/S00adam2 /sbin/adam2patcher >&- 2>&-
 }
-rm -f /etc/init.d/S00adam2 /sbin/adam2patcher >&- 2>&-

openwrt/package/base-files/brcm-2.4/etc/init.d/S05netconfig

@@ -1,35 +1,36 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-[ -e /etc/config/network ] && exit 0
+start() {
+	[ -e /etc/config/network ] && exit 0
 
-mkdir -p /etc/config
+	mkdir -p /etc/config
 
-(
+	(
 		if grep -E 'mtd0: 000(6|a)0000' /proc/mtd 2>&- >&-; then
 			# WGT634u
 			echo boardtype=wgt634u
 		else
 			strings /dev/mtdblock/3
 		fi
-) | awk '
+	) | awk '
-function p(cfgname, name) {
+	function p(cfgname, name) {
 		if (c[name] != "") print "	option " cfgname "	\"" c[name] "\""
-}
+	}
 	
-BEGIN {
+	BEGIN {
 		FS="="
 		c["lan_ifname"]="eth0.0 wl0"
 		c["wan_ifname"]="eth0.1"
 		c["vlan0ports"]="1 2 3 4 5*"
 		c["vlan1ports"]="0 5"
-}
+	}
 	
-($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") {
+	($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") {
 		nvram[$1] = $2
-}
+	}
 	
-END {
+	END {
 		# v1 hardware
 		if (nvram["boardtype"] == "bcm94710dev") {
 			# Asus WL-500g
@@ -82,5 +83,5 @@ END {
 		print "config interface	wan"
 		p("ifname", "wan_ifname")
 		print "	option proto	dhcp"
+	}' > /etc/config/network
 }
-' > /etc/config/network

openwrt/package/base-files/brcm-2.6/etc/init.d/S05netconfig

@@ -1,35 +1,36 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-[ -e /etc/config/network ] && exit 0
+start() {
+	[ -e /etc/config/network ] && exit 0
 	
-mkdir -p /etc/config
+	mkdir -p /etc/config
 	
-(
+	(
 		if grep -E 'mtd0: 000(6|a)0000' /proc/mtd 2>&- >&-; then
 			# WGT634u
 			echo boardtype=wgt634u
 		else
 			strings /dev/mtdblock/3
 		fi
-) | awk '
+	) | awk '
-function p(cfgname, name) {
+	function p(cfgname, name) {
 		if (c[name] != "") print "	option " cfgname "	\"" c[name] "\""
-}
+	}
 	
-BEGIN {
+	BEGIN {
 		FS="="
 		c["lan_ifname"]="eth0.0 wl0"
 		c["wan_ifname"]="eth0.1"
 		c["vlan0ports"]="1 2 3 4 5*"
 		c["vlan1ports"]="0 5"
-}
+	}
 	
-($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") {
+	($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") {
 		nvram[$1] = $2
-}
+	}
 	
-END {
+	END {
 		# v1 hardware
 		if (nvram["boardtype"] == "bcm94710dev") {
 			# Asus WL-500g
@@ -82,5 +83,5 @@ END {
 		print "config interface	wan"
 		p("ifname", "wan_ifname")
 		print "	option proto	dhcp"
+	}' > /etc/config/network
 }
-' > /etc/config/network

openwrt/package/base-files/default/etc/init.d/S10boot

@@ -1,25 +1,25 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-. /etc/functions.sh
+start() {
+	[ -f /proc/mounts ] || /sbin/mount_root
+	[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
+	vconfig set_name_type DEV_PLUS_VID_NO_PAD
 	
-[ -f /proc/mounts ] || /sbin/mount_root
+	HOSTNAME=${wan_hostname%%.*}
-[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
+	echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
-vconfig set_name_type DEV_PLUS_VID_NO_PAD
 	
-HOSTNAME=${wan_hostname%%.*}
+	mkdir -p /var/run
-echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
+	mkdir -p /var/log
+	mkdir -p /var/lock
+	touch /var/log/wtmp
+	touch /var/log/lastlog
+	[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 	
-mkdir -p /var/run
+	# manually trigger hotplug before loading modules
-mkdir -p /var/log
+	for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
-mkdir -p /var/lock
-touch /var/log/wtmp
-touch /var/log/lastlog
-[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
-
-# manually trigger hotplug before loading modules
-for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
 		/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net
-done
+	done
 	
-load_modules /etc/modules /etc/modules.d/*
+	load_modules /etc/modules /etc/modules.d/*
+}

openwrt/package/base-files/default/etc/init.d/S40network

@@ -1,9 +1,11 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-setup_switch() { return 0; }
+start() {
+	setup_switch() { return 0; }
+
+	include /lib/network
+	setup_switch
+	/sbin/wifi
+}
 
-. /etc/functions.sh
-include /lib/network
-setup_switch
-/sbin/wifi

openwrt/package/base-files/default/etc/init.d/S50httpd

@@ -1,4 +1,10 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-[ -d /www ] && httpd -p 80 -h /www -r OpenWrt
+start() {
+	[ -d /www ] && httpd -p 80 -h /www -r OpenWrt
+}
+
+stop() {
+	killall httpd
+}

openwrt/package/base-files/default/etc/init.d/S50telnet

@@ -1,4 +1,10 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null; then telnetd -l /bin/login; fi
+start() {
+	if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null; then telnetd -l /bin/login; fi
+}
+
+stop() {
+	killall telnetd
+}

openwrt/package/base-files/default/etc/init.d/S60cron

@@ -1,6 +1,12 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-mkdir -p /var/spool/cron
+start () {
-ln -s /etc/crontabs /var/spool/cron/crontabs
+	mkdir -p /var/spool/cron
-crond -c /etc/crontabs
+	ln -s /etc/crontabs /var/spool/cron/crontabs
+	crond -c /etc/crontabs
+}
+
+stop() {
+	killall crond
+}

openwrt/package/base-files/default/etc/init.d/S98done

@@ -1,11 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
-
-sysctl -p >&-
-
-# automagically run firstboot
-{ mount|grep "on / type tmpfs" 1>&-; } && {
-	lock /tmp/.switch2jffs
-	firstboot switch2jffs
-	lock -u /tmp/.switch2jffs
-}

openwrt/package/base-files/default/etc/init.d/rcS

@@ -10,6 +10,17 @@ ${FAILSAFE:+exit}
 syslogd -C 16 #${log_ipaddr:+-L -R $log_ipaddr}
 klogd
 
-for i in /etc/init.d/S*; do
+(
+	for i in /etc/init.d/S*; do
 		$i start 2>&1
-done | logger -s -p 6 -t '' &
+	done 
+	
+	sysctl -p >&-
+
+	# automagically run firstboot
+	{ mount|grep "on / type tmpfs" 1>&-; } && {
+		lock /tmp/.switch2jffs
+		firstboot switch2jffs
+		lock -u /tmp/.switch2jffs
+	}
+) | logger -s -p 6 -t '' &

openwrt/package/base-files/default/etc/rc.common

@@ -0,0 +1,77 @@
+#!/bin/sh
+. /etc/functions.sh
+
+start() {
+	return 0
+}
+
+stop() {
+	return 0
+}
+
+reload() {
+	return 1
+}
+
+restart() {
+	stop
+	start
+}
+
+boot() {
+	start
+}
+
+shutdown() {
+	return 0
+}
+
+disable() {
+	rm -f /etc/rc.d/${initscript##*/}
+}
+
+enable() {
+	disable
+	ln -s /etc/init.d/${initscript##*/} /etc/rc.d/${initscript##*/}
+}
+
+depends() {
+	return 0
+}
+
+help() {
+	cat <<EOF
+Syntax: $0 [command]
+
+Available commands:
+	start	Start the service
+	stop	Stop the service
+	restart	Restart the service
+	reload	Reload configuration files (or restart if that fails)
+	enable	Enable the service (load at boot time)
+	disable	Disable the service
+$EXTRA_HELP
+EOF
+}
+
+initscript="$1"
+action="$2"
+
+. "$initscript"
+
+cmds=
+for cmd in $EXTRA_COMMANDS; do
+	cmds="$cmd) $cmd;;"
+done
+eval "case \"\$action\" in
+	start) start;;
+	stop) stop;;
+	reload) reload || restart;;
+	restart) restart;;
+	enable) enable;;
+	disable) disable;;
+	boot) boot;;
+	shutdown) shutdown;;
+	$cmds
+	*) help;;
+esac"

openwrt/package/dnsmasq/files/dnsmasq.init

@@ -1,30 +1,32 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
-. /etc/functions.sh
+# Copyright (C) 2006 OpenWrt.org
-include /lib/network
-scan_interfaces
 
-# The following is to automatically configure the DHCP settings
+start() {
-# based on config settings. Feel free to replace all this crap
+	include /lib/network
-# with a simple "dnsmasq" and manage everything via the
+	scan_interfaces
-# /etc/dnsmasq.conf config file
 	
-[ -f /etc/dnsmasq.conf ] || exit
+	# The following is to automatically configure the DHCP settings
+	# based on config settings. Feel free to replace all this crap
+	# with a simple "dnsmasq" and manage everything via the
+	# /etc/dnsmasq.conf config file
 	
-args=""
+	[ -f /etc/dnsmasq.conf ] || exit
-iface=lan
-config_get ifname "$iface" ifname
-config_get proto "$iface" proto
 	
-[ "$proto" = static ] && dhcp_enable="${dhcp_enable:-1}"
+	args=""
-dhcp_start="${dhcp_start:-100}"
+	iface=lan
-dhcp_num="${dhcp_num:-50}"
+	config_get ifname "$iface" ifname
-dhcp_lease="${dhcp_lease:-12h}"
+	config_get proto "$iface" proto
 	
-# if dhcp_enable is unset and there is a dhcp server on the network already, default to dhcp_enable=0
+	[ "$proto" = static ] && dhcp_enable="${dhcp_enable:-1}"
-[ -z "$dhcp_enable" ] && udhcpc -n -q -R -s /bin/true -i $ifname >&- && dhcp_enable="${dhcp_enable:-0}"
+	dhcp_start="${dhcp_start:-100}"
+	dhcp_num="${dhcp_num:-50}"
+	dhcp_lease="${dhcp_lease:-12h}"
 	
-# dhcp_enable=0 disables the dhcp server
+	# if dhcp_enable is unset and there is a dhcp server on the network already, default to dhcp_enable=0
-(
+	[ -z "$dhcp_enable" ] && udhcpc -n -q -R -s /bin/true -i $ifname >&- && dhcp_enable="${dhcp_enable:-0}"
+	
+	# dhcp_enable=0 disables the dhcp server
+	(
 		[ -z "$dhcp_enable" -o "$dhcp_enable" -eq 1 ] && {
 			# no existing DHCP server?
 	
@@ -47,4 +49,9 @@ dhcp_lease="${dhcp_lease:-12h}"
 		[ -z "$wan_proto" -o "$wan_proto" = "none" ] || echo "@define wan_ifname $wan_ifname"
 	
 		cat /etc/dnsmasq.conf
-) | awk -f /usr/lib/parse-config.awk | dnsmasq -C /proc/self/fd/0
+	) | awk -f /usr/lib/parse-config.awk | dnsmasq -C /proc/self/fd/0
+}
+
+stop() {
+	killall dnsmasq
+}

openwrt/package/dropbear/files/dropbear.init

@@ -1,6 +1,8 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
 
-for type in rsa dss; do {
+start() {
+	for type in rsa dss; do {
 	  # check for keys
 	  key=/etc/dropbear/dropbear_${type}_host_key
 	  [ ! -f $key ] && {
@@ -11,6 +13,7 @@ for type in rsa dss; do {
 	    } &
 	    exit 0
 	  }
-}; done
+	}; done
 	
-/usr/sbin/dropbear
+	/usr/sbin/dropbear
+}

openwrt/package/iptables/files/firewall.init

@@ -1,34 +1,34 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
 ## Please make changes in /etc/firewall.user
 
-. /etc/functions.sh
+start() {
-include /lib/network
+	include /lib/network
+	scan_interfaces
 	
-scan_interfaces
+	config_get WAN wan ifname
-config_get WAN wan ifname
+	config_get LAN lan ifname
-config_get LAN lan ifname
 	
-## CLEAR TABLES
+	## CLEAR TABLES
-for T in filter nat; do
+	for T in filter nat; do
 		iptables -t $T -F
 		iptables -t $T -X
-done
+	done
 	
-iptables -N input_rule
+	iptables -N input_rule
-iptables -N output_rule
+	iptables -N output_rule
-iptables -N forwarding_rule
+	iptables -N forwarding_rule
 	
-iptables -t nat -N prerouting_rule
+	iptables -t nat -N prerouting_rule
-iptables -t nat -N postrouting_rule
+	iptables -t nat -N postrouting_rule
 	
-iptables -N LAN_ACCEPT
+	iptables -N LAN_ACCEPT
-[ -z "$WAN" ] || iptables -A LAN_ACCEPT -i "$WAN" -j RETURN
+	[ -z "$WAN" ] || iptables -A LAN_ACCEPT -i "$WAN" -j RETURN
-iptables -A LAN_ACCEPT -j ACCEPT
+	iptables -A LAN_ACCEPT -j ACCEPT
 	
-### INPUT
+	### INPUT
-###  (connections with the router as destination)
+	###  (connections with the router as destination)
 	
 	# base case
 	iptables -P INPUT DROP
@@ -50,8 +50,8 @@ iptables -A LAN_ACCEPT -j ACCEPT
 	iptables -A INPUT -p tcp -j REJECT --reject-with tcp-reset
 	iptables -A INPUT -j REJECT --reject-with icmp-port-unreachable
 	
-### OUTPUT
+	### OUTPUT
-### (connections with the router as source)
+	### (connections with the router as source)
 	
 	# base case
 	iptables -P OUTPUT DROP
@@ -70,8 +70,8 @@ iptables -A LAN_ACCEPT -j ACCEPT
 	iptables -A OUTPUT -p tcp -j REJECT --reject-with tcp-reset
 	iptables -A OUTPUT -j REJECT --reject-with icmp-port-unreachable
 	
-### FORWARDING
+	### FORWARDING
-### (connections routed through the router)
+	### (connections routed through the router)
 	
 	# base case
 	iptables -P FORWARD DROP 
@@ -91,13 +91,25 @@ iptables -A LAN_ACCEPT -j ACCEPT
 	# reject (what to do with anything not allowed earlier)
 	# uses the default -P DROP
 	
-### MASQ
+	### MASQ
 	iptables -t nat -A PREROUTING -j prerouting_rule
 	iptables -t nat -A POSTROUTING -j postrouting_rule
 	[ -z "$WAN" ] || iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE
 	
-## USER RULES
+	## USER RULES
-[ -f /etc/firewall.user ] && . /etc/firewall.user
+	[ -f /etc/firewall.user ] && . /etc/firewall.user
-[ -n "$WAN" -a -e /etc/config/firewall ] && {
+	[ -n "$WAN" -a -e /etc/config/firewall ] && {
 		awk -f /usr/lib/common.awk -f /usr/lib/firewall.awk /etc/config/firewall | ash
+	}
+}
+
+stop() {
+	iptables -P INPUT ACCEPT
+	iptables -P OUTPUT ACCEPT
+	iptables -P FORWARD ACCEPT
+	iptables -F
+	iptables -t nat -P PREROUTING ACCEPT
+	iptables -t nat -P POSTROUTING ACCEPT
+	iptables -t nat -P OUTPUT ACCEPT
+	iptables -t nat -F
 }

openwrt/package/madwifi/files/madwifi.init

@@ -1,2 +1,4 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
-iwpriv ath0 mode 3
+start() {
+	iwpriv ath0 mode 3
+}