fix startup scripts, fix stop routine

82 files changed, 234 insertions, 228 deletions

diff --git a/package/alix-switch/files/alix-switch.init b/package/alix-switch/files/alix-switch.init
index c783a1be5..adb6e9230 100644
--- a/package/alix-switch/files/alix-switch.init
+++ b/package/alix-switch/files/alix-switch.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	alix-switchd -d
+	/usr/sbin/alix-switchd -d
 	;;
 stop)
-	pkill alix-switchd
+	kill $(pgrep -f /usr/sbin/alix-switchd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/axtls/files/axhttpd.init b/package/axtls/files/axhttpd.init
index 61572bf0f..5a1671db5 100644
--- a/package/axtls/files/axhttpd.init
+++ b/package/axtls/files/axhttpd.init
@@ -17,7 +17,7 @@ start)
 	/usr/sbin/axhttpd >>/var/log/axhttpd.access
 	;;
 stop)
-	pkill axhttpd
+	kill $(pgrep -f /usr/sbin/axhttpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/bind/files/named.init b/package/bind/files/named.init
index b2052c1d3..c3ad09d85 100644
--- a/package/bind/files/named.init
+++ b/package/bind/files/named.init
@@ -11,11 +11,11 @@ autostop) ;;
 		;;
 	start)
 		if [ -f /etc/bind/named.conf ]; then
-			named -c /etc/bind/named.conf
+			/usr/sbin/named -c /etc/bind/named.conf
 		fi
 		;;
 	stop)
-		pkill named
+		kill $(pgrep -f /usr/sbin/named)
 		;;
 	restart)
 		sh $0 stop
diff --git a/package/bitlbee/files/bitlbee.init b/package/bitlbee/files/bitlbee.init
index 491b741c7..f4bb4e1c9 100644
--- a/package/bitlbee/files/bitlbee.init
+++ b/package/bitlbee/files/bitlbee.init
@@ -11,10 +11,10 @@ autostart)
 	;;
 start)
 	mkdir -p /var/lib/bitlbee
-	bitlbee -D
+	/usr/sbin/bitlbee -D
 	;;
 stop)
-	pkill bitlbee
+	kill $(pgrep -f /usr/sbin/bitlbee)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/bluez/files/bluez.init b/package/bluez/files/bluez.init
index 477013d9f..1100d4974 100644
--- a/package/bluez/files/bluez.init
+++ b/package/bluez/files/bluez.init
@@ -10,10 +10,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	bluetoothd
+	/usr/sbin/bluetoothd
 	;;
 stop)
-	pkill bluetoothd
+	kill $(pgrep -f /usr/sbin/bluetoothd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/busybox/files/crond.init b/package/busybox/files/crond.init
index dcccb7fca..ea8faa90a 100644
--- a/package/busybox/files/crond.init
+++ b/package/busybox/files/crond.init
@@ -11,10 +11,10 @@ autostart)
 	;;
 start)
 	mkdir -p /var/spool/cron
-	crond -c /etc/crontabs
+	/usr/sbin/crond -c /etc/crontabs
 	;;
 stop)
-	pkill crond
+	kill $(pgrep -f /usr/sbin/crond)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/busybox/files/inetd.init b/package/busybox/files/inetd.init
index 093e81f01..142fa6a03 100644
--- a/package/busybox/files/inetd.init
+++ b/package/busybox/files/inetd.init
@@ -14,7 +14,7 @@ start)
 autostop)
 	;;
 stop)
-	pkill inetd
+	kill $(pgrep -f /usr/sbin/inetd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init
index cbf0165c9..5f348042a 100644
--- a/package/busybox/files/syslog.init
+++ b/package/busybox/files/syslog.init
@@ -10,12 +10,12 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	syslogd $syslogd_flags
-	klogd
+	/sbin/syslogd $syslogd_flags
+	/sbin/klogd
 	;;
 stop)
-	pkill klogd
-	pkill syslogd
+	kill $(pgrep -f /sbin/klogd)
+	kill $(pgrep -f /sbin/syslogd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/busybox/files/udhcpd.init b/package/busybox/files/udhcpd.init
index d9627aa9d..788b5043e 100644
--- a/package/busybox/files/udhcpd.init
+++ b/package/busybox/files/udhcpd.init
@@ -11,10 +11,10 @@ autostart)
 	;;
 start)
 	touch /var/udhcp.leases
-	udhcpd -S
+	/usr/sbin/udhcpd -S
 	;;
 stop)
-	pkill udhcpd
+	kill $(pgrep -f /usr/sbin/udhcpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/busybox/files/watchdog.init b/package/busybox/files/watchdog.init
index 3aad38380..5fadef046 100644
--- a/package/busybox/files/watchdog.init
+++ b/package/busybox/files/watchdog.init
@@ -10,10 +10,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	watchdog $watchdog_flags /dev/watchdog
+	/usr/sbin/watchdog $watchdog_flags /dev/watchdog
 	;;
 stop)
-	pkill watchdog
+	kill $(pgrep -f /usr/sbin/watchdog)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/chillispot/files/chillispot.init b/package/chillispot/files/chillispot.init
index 8a09a3d35..569837d68 100644
--- a/package/chillispot/files/chillispot.init
+++ b/package/chillispot/files/chillispot.init
@@ -10,10 +10,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	chilli
+	/usr/sbin/chilli
 	;;
 stop)
-	pkill chilli
+	kill $(pgrep -f /usr/sbin/chilli)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/collectd/files/collectd.init b/package/collectd/files/collectd.init
index 468c6fa11..ce1905d91 100644
--- a/package/collectd/files/collectd.init
+++ b/package/collectd/files/collectd.init
@@ -11,10 +11,10 @@ autostart)
 	;;
 start)
 	[ -d /var/lib/collectd ] || mkdir -p /var/lib/collectd
-	collectd
+	/usr/sbin/collectd
 	;;
 stop)
-	pkill collectd
+	kill $(pgrep -f /usr/sbin/collectd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/cups/files/cupsd.init b/package/cups/files/cupsd.init
index 49c37b24f..6a702547c 100644
--- a/package/cups/files/cupsd.init
+++ b/package/cups/files/cupsd.init
@@ -16,7 +16,7 @@ start)
 	/usr/sbin/cupsd -c /etc/cups/cupsd.conf
 	;;
 stop)
-	pkill cupsd
+	kill $(pgrep -f /usr/sbin/cupsd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dansguardian/files/dansguardian.init b/package/dansguardian/files/dansguardian.init
index 2f2547f12..2fa9007b2 100644
--- a/package/dansguardian/files/dansguardian.init
+++ b/package/dansguardian/files/dansguardian.init
@@ -15,10 +15,10 @@ start)
 		touch /var/log/dansguardian-access.log
 		chown proxy:proxy /var/log/dansguardian-access.log
 	fi
-	dansguardian
+	/usr/sbin/dansguardian
 	;;
 stop)
-	pkill dansguardian
+	kill $(pgrep -f /usr/sbin/dansguardian)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dbus/files/dbus.init b/package/dbus/files/dbus.init
index 0f7367f38..4a1bac9e9 100644
--- a/package/dbus/files/dbus.init
+++ b/package/dbus/files/dbus.init
@@ -11,10 +11,10 @@ autostart)
 	;;
 start)
 	mkdir -p /var/run/dbus
-	dbus-daemon --config-file=/etc/dbus-1/system.conf
+	/usr/sbin/dbus-daemon --config-file=/etc/dbus-1/system.conf
 	;;
 stop)
-	pkill dbus-daemon
+	kill $(pgrep -f /usr/sbin/dbus-daemon)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dhcp-forwarder/files/dhcp-fwd.init b/package/dhcp-forwarder/files/dhcp-fwd.init
index 1a193f2ae..c69b30cb8 100644
--- a/package/dhcp-forwarder/files/dhcp-fwd.init
+++ b/package/dhcp-forwarder/files/dhcp-fwd.init
@@ -10,10 +10,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	dhcp-fwd
+	/usr/sbin/dhcp-fwd
 	;;
 stop)
-	pkill dhcp-fwd
+	kill $(pgrep -f /usr/sbin/dhcp-fwd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dhcp/files/dhcpd.init b/package/dhcp/files/dhcpd.init
index acdfc501f..02349acae 100644
--- a/package/dhcp/files/dhcpd.init
+++ b/package/dhcp/files/dhcpd.init
@@ -11,10 +11,10 @@ autostart)
 start)
 	mkdir -p /var/state/dhcp
 	touch /var/state/dhcp/dhcpd.leases
-	dhcpd $dhcpd_flags
+	/usr/sbin/dhcpd $dhcpd_flags
 	;;
 autostop|stop)
-	pkill dhcpd
+	kill $(pgrep -f /usr/sbin/dhcpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 01ca2cca6..7f4f75325 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -14,7 +14,7 @@ start)
 	/usr/sbin/dnsmasq
 	;;
 stop)
-	pkill dnsmasq
+	kill $(pgrep -f /usr/sbin/dnsmasq)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index 392d81c78..11b91db49 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -34,7 +34,7 @@ start)
 	/usr/sbin/dropbear $dropbear_flags
 	;;
 stop)
-	pkill dropbear
+	kill $(pgrep -f /usr/sbin/dropbear)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/esound/files/esd.init b/package/esound/files/esd.init
index b2aed6149..3533387ee 100644
--- a/package/esound/files/esd.init
+++ b/package/esound/files/esd.init
@@ -11,10 +11,10 @@ autostart)
 	;;
 start)
 	# start as another user via: su - mpd -c 'esd ..'
-	esd -public -tcp -nobeeps -noterminate &
+	/usr/bin/esd -public -tcp -nobeeps -noterminate &
 	;;
 stop)
-	pkill esd
+	kill $(pgrep -f /usr/bin/esd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/ez-ipupdate/files/ez-ipupdate.init b/package/ez-ipupdate/files/ez-ipupdate.init
index ea784481c..6344f54fa 100644
--- a/package/ez-ipupdate/files/ez-ipupdate.init
+++ b/package/ez-ipupdate/files/ez-ipupdate.init
@@ -13,7 +13,7 @@ start)
 	/usr/sbin/ez-ipupdate -c /etc/ez-ipupdate.conf -d
 	;;
 stop)
-	pkill ez-ipupdate
+	kill $(pgrep -f /usr/sbin/ez-ipupdate)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/fakeidentd/files/fakeidentd.init b/package/fakeidentd/files/fakeidentd.init
index 652ee02df..09119ccb7 100644
--- a/package/fakeidentd/files/fakeidentd.init
+++ b/package/fakeidentd/files/fakeidentd.init
@@ -10,10 +10,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	fakeidentd ${fakeidentd_flags}
+	/usr/sbin/fakeidentd ${fakeidentd_flags}
 	;;
 stop)
-	pkill fakeidentd
+	kill $(pgrep -f /usr/sbin/fakeidentd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/freeradius-server/files/radiusd.init b/package/freeradius-server/files/radiusd.init
index e43c5f94e..f22fa83e0 100644
--- a/package/freeradius-server/files/radiusd.init
+++ b/package/freeradius-server/files/radiusd.init
@@ -11,10 +11,10 @@ autostart)
 	;;
 start)
 	[ -d /var/log/radius ] || mkdir -p /var/log/radius
-	radiusd
+	/usr/sbin/radiusd
 	;;
 stop)
-	pkill radiusd
+	kill $(pgrep -f /usr/sbin/radiusd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/frickin/files/frickin.init b/package/frickin/files/frickin.init
index baf5d9c18..1b346c04b 100644
--- a/package/frickin/files/frickin.init
+++ b/package/frickin/files/frickin.init
@@ -10,10 +10,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	frickin ${frickin_flags}
+	/usr/sbin/frickin ${frickin_flags}
 	;;
 stop)
-	pkill frickin
+	kill $(pgrep -f /usr/sbin/frickin)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/gkrellmd/files/gkrellmd.init b/package/gkrellmd/files/gkrellmd.init
index 79b998713..54c42665c 100644
--- a/package/gkrellmd/files/gkrellmd.init
+++ b/package/gkrellmd/files/gkrellmd.init
@@ -10,10 +10,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	g