fix startup scripts, when variable is not set in /etc/rc.conf

package/avahi/files/avahi-daemon.init

@@ -5,22 +5,22 @@
 
 case $1 in
 autostop) ;;
-	autostart)
+autostart)
-		test x"${avahi:-NO}" = x"NO" && exit 0
+	test x"${avahi:-NO}" = x"NO" && exit 0
-		exec sh $0 start
+	exec sh $0 start
-		;;
+	;;
-	start)
+start)
-		avahi-daemon -D
+	avahi-daemon -D
-  		;;
+  	;;
-	stop)
+stop)
-  		avahi-daemon -k
+	avahi-daemon -k
-		;;
+	;;
-	restart)
+restart)
-  		sh $0 stop
+	sh $0 stop
-		sh $0 start
+	sh $0 start
-		;;
+	;;
-	*)
+*)
-		echo "usage: $0 { start | stop | reload }"
+	echo "usage: $0 { start | stop | reload }"
-		exit 1
+	exit 1
 esac
 exit $?

package/axtls/files/axhttpd.init

@@ -10,8 +10,8 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	if [ ! -d /www -a ! -h /www ]; then
+	if [ ! -d /srv/www -a ! -h /srv/www ]; then
-		echo "axhttpd not started. create /www first"
+		echo "axhttpd not started. create /srv/www first"
 		exit 0
 	fi
 	/usr/sbin/axhttpd >>/var/log/axhttpd.access

package/bkeymaps/files/kbd.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $kbd = NO ]] && exit 0
+	test x"${kbd:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/busybox/files/syslog.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $syslogd_flags = NO ]] && exit 0
+	test x"${syslogd_flags:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/busybox/files/udhcpd.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $udhcpd = NO ]] && exit 0
+	test x"${udhcpd:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/busybox/files/watchdog.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $watchdog = NO ]] && exit 0
+	test x"${watchdog:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/dhcp/files/dhcp-server.postinst

@@ -1,3 +1,4 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf 'e.g. "eth0.1 eth1"' dhcpd_flags
+add_rcconf dhcpd dhcpd NO

package/dhcp/files/dhcpd.init

@@ -5,7 +5,7 @@
 
 case $1 in
 autostart)
-	[[ $dhcpd_flags = NO ]] && exit 0
+	test x"${dhcpd:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/dnsmasq/files/dnsmasq.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $dnsmasq = NO ]] && exit 0
+	test x"${dnsmasq:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/mini_httpd/files/mini-httpd.postinst

@@ -1,3 +1,4 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf '"NO" to disable, "-C /etc/mini_httpd.conf" otherwise' mini_httpd_flags
+add_rcconf mini_httpd mini_httpd NO

package/mini_httpd/files/mini_httpd.init

@@ -7,7 +7,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $mini_httpd_flags = NO ]] && exit 0
+	test x"${mini_httpd:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/mt-daapd/files/mt-daapd.init

@@ -7,7 +7,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $mt_daapd = NO ]] && exit 0
+	test x"${mt_daapd:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/net-snmp/files/snmpd.init

@@ -1,13 +1,12 @@
 #!/bin/sh
 #PKG snmpd
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in
 autostop) ;;
 autostart)
-	[[ $snmpd = NO ]] && exit 0
+	test x"${snmpd:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/netperf/files/netserver.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG netperf
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in

package/nfs-utils/files/nfs.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG nfs-utils
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in

package/nfs-utils/files/nfsd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG nfs-utils
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in

package/nut/files/upsd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG nut
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/olsrd/files/olsrd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG olsrd
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/openct/files/openct.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG openct
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/openldap/files/slapd.init

@@ -1,13 +1,12 @@
 #!/bin/sh
 #PKG openldap-slapd
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in
 autostop) ;;
 autostart)
-	[[ $slapd = NO ]] && exit 0
+	test x"${slapd:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/openntpd/files/ntpd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG openntpd
 #INIT 55
-
 . /etc/rc.conf
 
 case $1 in

package/opensips/files/opensips.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG opensips
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/openssh/files/sshd.init

@@ -1,13 +1,12 @@
 #!/bin/sh
 #PKG openssh-server
 #INIT 50
-
 . /etc/rc.conf
 
 case $1 in
 autostop) ;;
 autostart)
-	[[ $openssh = NO ]] && exit 0
+	test x"${openssh:-NO}" = x"NO" && exit 0
 	grep "^dropbear" /etc/rc.conf >/dev/null 2>&1 || dropbear=NO
 	if [[ $openssh = AUTO && $dropbear != NO ]]; then
 		echo openssh not starting: set to AUTO and dropbear is enabled

package/openswan/files/openswan.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG openswan
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/openvpn/files/openvpn.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG openvpn
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/osiris/files/osirisd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG osirisd
 #INIT 75
-
 . /etc/rc.conf
 
 case $1 in

package/p910nd/files/p910nd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG p910nd
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in

package/parprouted/files/parprouted.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG parprouted
 #INIT 75
-
 . /etc/rc.conf
 
 case $1 in

package/pcsc-lite/files/pcscd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG pcsc-lite
 #INIT 80
-
 . /etc/rc.conf
 
 case $1 in

package/pdnsd/files/pdnsd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG pdnsd
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/php/files/php.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG php-fastcgi
 #INIT 80
-
 . /etc/rc.conf
 
 export PHP_FCGI_CHILDREN=''

package/pmacct/files/nfacctd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG nfacctd
 #INIT 80
-
 . /etc/rc.conf
 
 case $1 in

package/pmacct/files/pmacctd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG pmacctd
 #INIT 80
-
 . /etc/rc.conf
 
 case $1 in

package/portmap/files/portmap.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG portmap
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/pptpd/files/pptpd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG pptpd
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/privoxy/files/privoxy.init

@@ -6,7 +6,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	[[ $privoxy = NO ]] && exit 0
+	test x"${privoxy:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/proftpd/files/proftpd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG proftpd
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/radvd/files/radvd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG radvd
 #INIT 51
-
 . /etc/rc.conf
 
 case $1 in

package/rarpd/files/rarpd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG rarpd
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/rdate/files/rdate.init

@@ -1,12 +1,11 @@
 #!/bin/sh
 #PKG rdate
 #INIT 54
-
 . /etc/rc.conf
 
 case $1 in
 autostart|start|restart)
-	[[ $rdate_flags = NO ]] && exit 0
+	test x"${rdate:-NO}" = x"NO" && exit 0
 	rdate $rdate_flags
 	;;
 autostop|stop)

package/reaim/files/reaim.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG reaim
 #INIT 75
-
 . /etc/rc.conf
 
 IPT=/usr/sbin/iptables

package/rng-tools/files/rngd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG rng-tools
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/rp-pppoe/files/pppoe-client.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG pppoe-server
 #INIT 50
-
 . /etc/rc.conf
 
 case $1 in

package/rp-pppoe/files/pppoe-relay.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG pppoe-relay
 #INIT 50
-
 . /etc/rc.conf
 
 case $1 in

package/rp-pppoe/files/pppoe-server.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG pppoe-server
 #INIT 50
-
 . /etc/rc.conf
 
 case $1 in

package/rpcbind/files/rpcbind.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG rpcbind
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/rrdcollect/files/rrdcollect.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG rrdcollect
 #INIT 90
-
 . /etc/rc.conf
 
 case $1 in

package/samba/files/samba.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG samba
 #INIT 80
-
 . /etc/rc.conf
 
 case $1 in

package/scanlogd/files/scanlogd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG scanlogd
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/shorewall-common/files/shorewall.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG shorewall-common
 #INIT 45
-
 . /etc/rc.conf
 
 case $1 in

package/siproxd/files/siproxd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG siproxd
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/snort/files/snort.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG snort
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/squid/files/squid.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG squid
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in

package/srelay/files/srelay.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG srelay
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/strongswan/files/strongswan.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG strongswan
 #INIT 60
-
 . /etc/rc.conf
 
 case $1 in

package/subversion/files/svnserve.init

@@ -1,13 +1,12 @@
 #!/bin/sh
 #PKG subversion
 #INIT 80
-
 . /etc/rc.conf
 
 case $1 in
 autostop) ;;
 autostart)
-	[[ $svnserve = YES ]] || exit 0
+	test x"${svnserve:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)

package/syslog-ng/files/syslog-ng.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG syslog-ng
 #INIT 05
-
 . /etc/rc.conf
 
 case $1 in

package/tinyproxy/files/tinyproxy.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG tinyproxy
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in

package/tor/files/tor.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG tor
 #INIT 80
-
 . /etc/rc.conf
 
 case $1 in

package/ulogd/files/ulogd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG ulogd
 #INIT 49
-
 . /etc/rc.conf
 
 case $1 in

package/uvd/files/uvd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG uvd
 #INIT 90
-
 . /etc/rc.conf
 
 case $1 in

package/vrrpd/files/vrrpd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG vrrpd
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in

package/vsftpd/files/vsftpd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG vsftpd
 #INIT 70
-
 . /etc/rc.conf
 
 case $1 in

package/watchdog/files/watchdog.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG watchdog
 #INIT 15
-
 . /etc/rc.conf 
 
 case $1 in

package/wifidog/files/wifidog.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG wifidog
 #INIT 65
-
 . /etc/rc.conf
 
 case $1 in

package/xinetd/files/xinetd.init

@@ -1,7 +1,6 @@
 #!/bin/sh
 #PKG xinetd
 #INIT 50
-
 . /etc/rc.conf
 
 case $1 in