fix startup scripts, fix stop routine

83 files changed, 238 insertions, 232 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)
-	gkrellmd -d
+	/usr/bin/gkrellmd -d
 	;;
 stop)
-	pkill gkrellmd
+	kill $(pgrep -f /usr/bin/gkrellmd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/gmediaserver/files/gmediaserver.init b/package/gmediaserver/files/gmediaserver.init
index 1c67e5f40..c9b932249 100644
--- a/package/gmediaserver/files/gmediaserver.init
+++ b/package/gmediaserver/files/gmediaserver.init
@@ -5,22 +5,22 @@
 
 case $1 in
 autostop) ;;
-	autostart)
-		test x"${gmediaserver:-NO}" = x"NO" && exit 0
-		exec sh $0 start
-		;;
-	start)
-		gmediaserver $gmediaserver_flags
-		;;
-	stop)
-		pkill gmediaserver
-		;;
-	restart)
-		sh $0 stop
-		sh $0 start
-		;;
-	*)
-		echo "usage: $0 (start | stop | restart)"
-		exit 1
+autostart)
+	test x"${gmediaserver:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/gmediaserver $gmediaserver_flags
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/gmediaserver)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "usage: $0 (start | stop | restart)"
+	exit 1
 esac
 exit $?
diff --git a/package/gpm/files/gpm.init b/package/gpm/files/gpm.init
index 812fc1bf7..95565a1fa 100644
--- a/package/gpm/files/gpm.init
+++ b/package/gpm/files/gpm.init
@@ -14,7 +14,7 @@ start)
 	/usr/sbin/gpm $gpm_flags
 	;;
 stop)
-	pkill gpm
+	kill $(pgrep -f /usr/sbin/gpm)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/heimdal/files/heimdal.init b/package/heimdal/files/heimdal.init
index 33692f111..79bb10198 100644
--- a/package/heimdal/files/heimdal.init
+++ b/package/heimdal/files/heimdal.init
@@ -15,9 +15,9 @@ start)
 	/usr/sbin/kpasswdd &
 	;;
 stop)
-	pkill kdc
-	pkill kadmind
-	pkill kpasswdd
+	kill $(pgrep -f /usr/sbin/kdc)
+	kill $(pgrep -f /usr/sbin/kadmind)
+	kill $(pgrep -f /usr/sbin/kpasswdd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/htpdate/files/htpdate.init b/package/htpdate/files/htpdate.init
index 0b3f34ad6..f79531f20 100644
--- a/package/htpdate/files/htpdate.init
+++ b/package/htpdate/files/htpdate.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	htpdate -l -s -t $htpdate_flags && htpdate -D $htpdate_flags
+	/usr/sbin/htpdate -l -s -t $htpdate_flags && htpdate -D $htpdate_flags
 	;;
 stop)
-	pkill htpdate
+	kill $(pgrep -f /usr/sbin/htpdate)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/igmpproxy/files/igmpproxy.init b/package/igmpproxy/files/igmpproxy.init
index fd2b06f9f..48ce1556d 100644
--- a/package/igmpproxy/files/igmpproxy.init
+++ b/package/igmpproxy/files/igmpproxy.init
@@ -13,7 +13,7 @@ start)
 	/usr/sbin/igmpproxy /etc/igmpproxy.conf &
 	;;
 stop)
-	pkill igmpproxy
+	kill $(pgrep -f /usr/sbin/igmpproxy)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/krb5/files/krb5.init b/package/krb5/files/krb5.init
index 259c03651..d651fcc57 100644
--- a/package/krb5/files/krb5.init
+++ b/package/krb5/files/krb5.init
@@ -14,8 +14,8 @@ start)
 	/usr/sbin/kadmind &
 	;;
 stop)
-	pkill krb5kdc
-	pkill kadmind
+	kill $(pgrep -f /usr/sbin/krb5kdc)
+	kill $(pgrep -f /usr/sbin/kadmind)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/lighttpd/files/lighttpd.init b/package/lighttpd/files/lighttpd.init
index 37b543fd2..cb0a117d9 100644
--- a/package/lighttpd/files/lighttpd.init
+++ b/package/lighttpd/files/lighttpd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	lighttpd $lighttpd_flags
+	/usr/sbin/lighttpd $lighttpd_flags
 	;;
 stop)
-	pkill lighttpd
+	kill $(pgrep -f /usr/sbin/lighttpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/maradns/files/maradns.init b/package/maradns/files/maradns.init
index ca256f517..e8f21dd0c 100644
--- a/package/maradns/files/maradns.init
+++ b/package/maradns/files/maradns.init
@@ -13,10 +13,10 @@ autostart)
 start)
 	[ -f /etc/mararc ] || exit
 	[ -d /etc/maradns ] || mkdir /etc/maradns
-	maradns &
+	/usr/sbin/maradns &
 	;;
 stop)
-	pkill maradns
+	kill $(pgrep -f /usr/sbin/maradns)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/mini_httpd/files/mini_httpd.init b/package/mini_httpd/files/mini_httpd.init
index 53411d41c..5b7796e27 100644
--- a/package/mini_httpd/files/mini_httpd.init
+++ b/package/mini_httpd/files/mini_httpd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	mini_httpd $mini_httpd_flags
+	/usr/sbin/mini_httpd $mini_httpd_flags
 	;;
 stop)
-	pkill mini_httpd
+	kill $(pgrep -f /usr/sbin/mini_httpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/miredo/files/miredo-server.init b/package/miredo/files/miredo-server.init
index b77e62af6..09076ed43 100644
--- a/package/miredo/files/miredo-server.init
+++ b/package/miredo/files/miredo-server.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	miredo-server
+	/usr/sbin/miredo-server
 	;;
 stop)
-	pkill miredo-server
+	kill $(pgrep -f /usr/sbin/miredo-server)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/miredo/files/miredo.init b/package/miredo/files/miredo.init
index 23285fb86..39f53ecde 100644
--- a/package/miredo/files/miredo.init
+++ b/package/miredo/files/miredo.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	miredo
+	/usr/sbin/miredo
 	;;
 stop)
-	pkill miredo
+	kill $(pgrep -f /usr/sbin/miredo)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/monit/files/monit.init b/package/monit/files/monit.init
index d4d914f95..b0d1f1f73 100644
--- a/package/monit/files/monit.init
+++ b/package/monit/files/monit.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	monit $monit_flags
+	/usr/sbin/monit $monit_flags
 	;;
 stop)
-	pkill monit	
+	kill $(pgrep -f /usr/sbin/monit	)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/mrd6/files/mrd6.init b/package/mrd6/files/mrd6.init
index da6b5eea3..8ada9352d 100644
--- a/package/mrd6/files/mrd6.init
+++ b/package/mrd6/files/mrd6.init
@@ -14,7 +14,7 @@ start)
 	/usr/sbin/mrd6 -f /etc/mrd6.conf -D
 	;;
 stop)
-	pkill mrd6
+	kill $(pgrep -f /usr/sbin/mrd6)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/mt-daapd/files/mt-daapd.init b/package/mt-daapd/files/mt-daapd.init
index a7632388a..4ad5f2553 100644
--- a/package/mt-daapd/files/mt-daapd.init
+++ b/package/mt-daapd/files/mt-daapd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	mt-daapd
+	/usr/sbin/mt-daapd
 	;;
 stop)
-	pkill mt-daapd
+	kill $(pgrep -f /usr/sbin/mt-daapd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/net-snmp/files/snmpd.init b/package/net-snmp/files/snmpd.init
index 8be660ca4..f7e9b917b 100644
--- a/package/net-snmp/files/snmpd.init
+++ b/package/net-snmp/files/snmpd.init
@@ -12,10 +12,10 @@ autostart)
 	;;
 start)
 	[ -d /var/lib/snmp ] || mkdir -p /var/lib/snmp
-	snmpd $snmpd_flags
+	/usr/sbin/snmpd $snmpd_flags
 	;;
 stop)
-	pkill snmpd
+	kill $(pgrep -f /usr/sbin/snmpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/netperf/files/netserver.init b/package/netperf/files/netserver.init
index eea806a67..67a9e36d6 100644
--- a/package/netperf/files/netserver.init
+++ b/package/netperf/files/netserver.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	netserver
+	/usr/sbin/netserver
 	;;
 stop)
-	pkill netserver
+	kill $(pgrep -f /usr/sbin/netserver)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init
index 8d438e219..55dbd1c04 100644
--- a/package/nfs-utils/files/nfsd.init
+++ b/package/nfs-utils/files/nfsd.init
@@ -29,11 +29,11 @@ start)
 	fi
 	;;
 stop)
-	pkill nfsd
-	pkill mountd
+	kill $(pgrep -f /usr/sbin/nfsd)
+	kill $(pgrep -f /usr/sbin/mountd)
 	if [ ${nfs_server_version} -eq 4 ];then
-		pkill idmapd
-		pkill svcgssd
+		kill $(pgrep -f /usr/sbin/idmapd)
+		kill $(pgrep -f /usr/sbin/svcgssd)
 	fi
 	;;
 restart)
diff --git a/package/nut/files/upsd.init b/package/nut/files/upsd.init
index edd023eff..8ca1fb996 100644
--- a/package/nut/files/upsd.init
+++ b/package/nut/files/upsd.init
@@ -16,7 +16,7 @@ start)
 	/usr/sbin/upsd || exit 2
 	;;
 stop)
-	/usr/sbin/upsd -c stop || pkill upsd
+	/usr/sbin/upsd -c stop || kill $(pgrep -f /usr/sbin/upsd)
 	/usr/bin/upsdrvctl stop
 	;;
 restart)
diff --git a/package/olsrd/files/olsrd.init b/package/olsrd/files/olsrd.init
index 4d348d88f..f74aa35d8 100644
--- a/package/olsrd/files/olsrd.init
+++ b/package/olsrd/files/olsrd.init
@@ -11,7 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	olsrd
+	/usr/sbin/olsrd
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/olsrd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/openntpd/files/ntpd.init b/package/openntpd/files/ntpd.init
index fd655e9cc..a11e9415e 100644
--- a/package/openntpd/files/ntpd.init
+++ b/package/openntpd/files/ntpd.init
@@ -15,7 +15,7 @@ start)
 	/usr/sbin/ntpd $ntpd_flags
 	;;
 stop)
-	pkill ntpd
+	kill $(pgrep -f /usr/sbin/ntpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/opensips/files/opensips.init b/package/opensips/files/opensips.init
index 3f60f8be6..b7d73f7d4 100644
--- a/package/opensips/files/opensips.init
+++ b/package/opensips/files/opensips.init
@@ -14,7 +14,7 @@ start)
 	/usr/sbin/opensips
 	;;
 stop)
-	pkill opensips
+	kill $(pgrep -f /usr/sbin/opensips)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/openvpn/files/openvpn.init b/package/openvpn/files/openvpn.init
index 9998742e2..9e7f11af4 100644
--- a/package/openvpn/files/openvpn.init
+++ b/package/openvpn/files/openvpn.init
@@ -12,11 +12,11 @@ autostart)
 	;;
 start)
 	for c in $(ls /etc/openvpn/*.conf 2>&-); do
-		openvpn --cd /etc/openvpn --config "$c" --daemon
+		/usr/sbin/openvpn --cd /etc/openvpn --config "$c" --daemon
 	done
 	;;
 stop)
-	pkill openvpn
+	kill $(pgrep -f /usr/sbin/openvpn)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/osiris/files/osirisd.init b/package/osiris/files/osirisd.init
index 1b1106967..d13aa494f 100644
--- a/package/osiris/files/osirisd.init
+++ b/package/osiris/files/osirisd.init
@@ -12,10 +12,10 @@ autostart)
 	;;
 start)
 	[ -d /var/lib/osiris ] || mkdir -p /var/lib/osiris
-	osirisd
+	/usr/sbin/osirisd
 	;;
 stop)
-	pkill osirisd
+	kill $(pgrep -f /usr/sbin/osirisd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/p910nd/files/p910nd.init b/package/p910nd/files/p910nd.init
index 20e872c42..c2884caee 100644
--- a/package/p910nd/files/p910nd.init
+++ b/package/p910nd/files/p910nd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	p910nd $p910nd_flags
+	/usr/sbin/p910nd $p910nd_flags
 	;;
 stop)
-	pkill p9100d
+	kill $(pgrep -f /usr/sbin/p910d)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/parprouted/files/parprouted.init b/package/parprouted/files/parprouted.init
index a0c82d1a1..6f612177f 100644
--- a/package/parprouted/files/parprouted.init
+++ b/package/parprouted/files/parprouted.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	parprouted ${parprouted_flags}
+	/usr/sbin/parprouted ${parprouted_flags}
 	;;
 stop)
-	pkill parprouted
+	kill $(pgrep -f /usr/sbin/parprouted)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/pcsc-lite/files/pcscd.init b/package/pcsc-lite/files/pcscd.init
index 5e86ae00a..c1724f495 100644
--- a/package/pcsc-lite/files/pcscd.init
+++ b/package/pcsc-lite/files/pcscd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	pcscd
+	/usr/sbin/pcscd
   	;;
 stop)
-	pkill pcscd
+	kill $(pgrep -f /usr/sbin/pcscd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/pdnsd/files/pdnsd.init b/package/pdnsd/files/pdnsd.init
index b67696469..717e4f352 100644
--- a/package/pdnsd/files/pdnsd.init
+++ b/package/pdnsd/files/pdnsd.init
@@ -16,10 +16,10 @@ start)
 	touch /var/cache/pdnsd/pdnsd.cache
 	# this allows for strict_setuid
 	chown -R nobody:nogroup /var/cache/pdnsd
-	pdnsd -d
+	/usr/sbin/pdnsd -d
 	;;
 stop)
-	pkill pdnsd
+	kill $(pgrep -f /usr/sbin/pdnsd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/php/files/php.init b/package/php/files/php.init
index 3d404ac79..04e40403d 100644
--- a/package/php/files/php.init
+++ b/package/php/files/php.init
@@ -13,10 +13,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	php ${php_flags} &
+	/usr/bin/php ${php_flags} &
 	;;
 stop)
-	pkill php
+	kill $(pgrep -f /usr/bin/php)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/pmacct/files/nfacctd.init b/package/pmacct/files/nfacctd.init
index 911184d21..d46668780 100644
--- a/package/pmacct/files/nfacctd.init
+++ b/package/pmacct/files/nfacctd.init
@@ -6,22 +6,22 @@
 
 case $1 in
 autostop) ;;
-	autostart)
-		test x"${nfacctd:-NO}" = x"NO" && exit 0
-		exec sh $0 start
-		;;
-	start)
-		nfacctd $nfaccd_flags
-		;;
-	stop)
-		pkill nfacctd
-		;;
-	restart)
-		sh $0 stop
-		sh $0 start
-		;;
-	*)
-		echo "usage: $0 {start | stop | restart}"
-		exit 1
+autostart)
+	test x"${nfacctd:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/nfacctd $nfaccd_flags
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/nfacctd)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "usage: $0 {start | stop | restart}"
+	exit 1
 esac
 exit $?
diff --git a/package/pmacct/files/pmacctd.init b/package/pmacct/files/pmacctd.init
index 5a44474c0..3b9ec5ac5 100644
--- a/package/pmacct/files/pmacctd.init
+++ b/package/pmacct/files/pmacctd.init
@@ -6,22 +6,22 @@
 
 case $1 in
 autostop) ;;
-	autostart)
-		test x"${pmacctd:-NO}" = x"NO" && exit 0
-		exec sh $0 start
-		;;
-	start)
-		pmacctd $pmacctd_flags
-		;;
-	stop)
-		pkill pmacctd
-		;;
-	restart)
-		sh $0 stop
-		sh $0 start
-		;;
-	*)
-		echo "usage: $0 {start | stop | restart}"
-		exit 1
+autostart)
+	test x"${pmacctd:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/pmacctd $pmacctd_flags
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/pmacctd)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "usage: $0 {start | stop | restart}"
+	exit 1
 esac
 exit $?
diff --git a/package/portmap/files/portmap.init b/package/portmap/files/portmap.init
index ad0c2b075..a3dc4a8e6 100644
--- a/package/portmap/files/portmap.init
+++ b/package/portmap/files/portmap.init
@@ -12,10 +12,10 @@ autostart)
 	;;
 start)
 	mkdir -p /tmp/.portmap
-	portmap -t /tmp/.portmap
+	/usr/sbin/portmap -t /tmp/.portmap
 	;;
 stop)
-	pkill portmap
+	kill $(pgrep -f /usr/sbin/portmap)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/pptpd/files/pptpd.init b/package/pptpd/files/pptpd.init
index e26b1f072..c0f19546c 100644
--- a/package/pptpd/files/pptpd.init
+++ b/package/pptpd/files/pptpd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	pptpd
+	/usr/sbin/pptpd
 	;;
 stop)
-	pkill pptpd
+	kill $(pgrep -f /usr/sbin/pptpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/privoxy/files/privoxy.init b/package/privoxy/files/privoxy.init
index ab782e9ef..3f4bd6021 100644
--- a/package/privoxy/files/privoxy.init
+++ b/package/privoxy/files/privoxy.init
@@ -14,7 +14,7 @@ start)
 	/usr/sbin/privoxy /etc/privoxy
 	;;
 stop)
-	pkill privoxy
+	kill $(pgrep -f /usr/sbin/privoxy)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/proftpd/files/proftpd.init b/package/proftpd/files/proftpd.init
index bf3dc0efe..813f20730 100644
--- a/package/proftpd/files/proftpd.init
+++ b/package/proftpd/files/proftpd.init
@@ -12,10 +12,10 @@ autostart)
 	;;
 start)
 	[ -f /etc/proftpd.conf ] || exit
-	proftpd
+	/usr/sbin/proftpd
 	;;
 stop)
-	pkill proftpd
+	kill $(pgrep -f /usr/sbin/proftpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/radvd/files/radvd.init b/package/radvd/files/radvd.init
index cfb4125bc..e289a2b65 100644
--- a/package/radvd/files/radvd.init
+++ b/package/radvd/files/radvd.init
@@ -16,7 +16,7 @@ start)
 	;;
 
 stop)
-	pkill radvd
+	kill $(pgrep -f /usr/sbin/radvd)
 	echo 0 > /proc/sys/net/ipv6/conf/all/forwarding
 	;;
 
diff --git a/package/rarpd/files/rarpd.init b/package/rarpd/files/rarpd.init
index 2b8e0f876..70bda58d5 100644
--- a/package/rarpd/files/rarpd.init
+++ b/package/rarpd/files/rarpd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	rarpd $rarpd_flags
+	/usr/sbin/rarpd $rarpd_flags
 	;;
 stop)
-	pkill rarpd
+	kill $(pgrep -f /usr/sbin/rarpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/reaim/files/reaim.init b/package/reaim/files/reaim.init
index 71a1336b0..7e3596472 100644
--- a/package/reaim/files/reaim.init
+++ b/package/reaim/files/reaim.init
@@ -18,10 +18,10 @@ start)
         $IPT -A input_rule -i $WAN -p tcp --dport 4443 -j ACCEPT
         $IPT -A input_rule -i $WAN -p tcp --dport 5566 -j ACCEPT
         $IPT -A input_rule -i $WAN -p tcp --dport 40000:40099 -j ACCEPT
-	reaim
+	/usr/sbin/reaim
 	;;
 stop)
-	pkill reaim
+	kill $(pgrep -f /usr/sbin/reaim)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/rng-tools/files/rngd.init b/package/rng-tools/files/rngd.init
index 1464209c0..3fd74fb7d 100644
--- a/package/rng-tools/files/rngd.init
+++ b/package/rng-tools/files/rngd.init
@@ -22,10 +22,10 @@ start)
 		echo "no hardware RNG found, falling back to /dev/urandom"
 		devnode=/dev/urandom
 	fi
-	rngd -b -r $devnode
+	/usr/sbin/rngd -b -r $devnode
 	;;
 stop)
-	pkill rngd
+	kill $(pgrep -f /usr/sbin/rngd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/rp-pppoe/files/pppoe-relay.init b/package/rp-pppoe/files/pppoe-relay.init
index 458a47eaf..7df674e5a 100644
--- a/package/rp-pppoe/files/pppoe-relay.init
+++ b/package/rp-pppoe/files/pppoe-relay.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	pppoe-relay $pppoe_relay_flags
+	/usr/sbin/pppoe-relay $pppoe_relay_flags
 	;;
 stop)
-	pkill pppoe-relay
+	kill $(pgrep -f /usr/sbin/pppoe-relay)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/rp-pppoe/files/pppoe-server.init b/package/rp-pppoe/files/pppoe-server.init
index b078110a0..36c6be650 100644
--- a/package/rp-pppoe/files/pppoe-server.init
+++ b/package/rp-pppoe/files/pppoe-server.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	pppoe-server
+	/usr/sbin/pppoe-server
 	;;
 stop)
-	pkill pppoe-server
+	kill $(pgrep -f /usr/sbin/pppoe-server)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/rpcbind/files/rpcbind.init b/package/rpcbind/files/rpcbind.init
index d11f01100..de794f72e 100644
--- a/package/rpcbind/files/rpcbind.init
+++ b/package/rpcbind/files/rpcbind.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	rpcbind
+	/usr/sbin/rpcbind
 	;;
 stop)
-	pkill rpcbind
+	kill $(pgrep -f /usr/sbin/rpcbind)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/rrdcollect/files/rrdcollect.init b/package/rrdcollect/files/rrdcollect.init
index 478150e90..d5b0e6790 100644
--- a/package/rrdcollect/files/rrdcollect.init
+++ b/package/rrdcollect/files/rrdcollect.init
@@ -12,10 +12,10 @@ autostart)
 	;;
 start)
 	[ -d /var/lib/rrdcollect ] || mkdir -p /var/lib/rrdcollect
-	rrdcollect
+	/usr/sbin/rrdcollect
 	;;
 stop)
-	pkill rrdcollect
+	kill $(pgrep -f /usr/sbin/rrdcollect)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/samba/files/samba.init b/package/samba/files/samba.init
index a8279e366..ee8b788d8 100644
--- a/package/samba/files/samba.init
+++ b/package/samba/files/samba.init
@@ -13,12 +13,12 @@ autostart)
 start)
 	[ -d /var/run/samba ] || mkdir -p /var/run/samba
 	[ -d /var/log/samba ] || mkdir -p /var/log/samba
-	nmbd -D 
-	smbd -D
+	/usr/sbin/nmbd -D 
+	/usr/sbin/smbd -D
 	;;
 stop)
-	pkill nmbd
-	pkill smbd
+	kill $(pgrep -f /usr/sbin/nmbd)
+	kill $(pgrep -f /usr/sbin/smbd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/scanlogd/files/scanlogd.init b/package/scanlogd/files/scanlogd.init
index 696ee8d77..4b1a8f15b 100644
--- a/package/scanlogd/files/scanlogd.init
+++ b/package/scanlogd/files/scanlogd.init
@@ -12,10 +12,10 @@ autostart)
 	;;
 start)
 	mkdir -p `grep "^scanlogd:" /etc/passwd | cut -d: -f6`
-	scanlogd $scanlogd_flags
+	/usr/sbin/scanlogd $scanlogd_flags
 	;;
 stop)
-	pkill scanlogd
+	kill $(pgrep -f /usr/sbin/scanlogd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/siproxd/files/siproxd.init b/package/siproxd/files/siproxd.init
index e186ec934..22e183b44 100644
--- a/package/siproxd/files/siproxd.init
+++ b/package/siproxd/files/siproxd.init
@@ -6,22 +6,22 @@
 
 case $1 in
 autostop) ;;
-	autostart)
-		test x"${siproxd:-NO}" = x"NO" && exit 0
-		exec sh $0 start
-		;;
-	start)
-		siproxd
-		;;
-	stop)
-  		pkill siproxd
-		;;
-	restart)
-		sh $0 stop
-		sh $0 start
-		;;
-	*)
-		echo "usage: $0 {start | stop | restart}"
-		exit 1
+autostart)
+	test x"${siproxd:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/siproxd
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/siproxd)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "usage: $0 {start | stop | restart}"
+	exit 1
 esac
 exit $?
diff --git a/package/snort/files/snort.init b/package/snort/files/snort.init
index b426a9fe7..87de3561c 100644
--- a/package/snort/files/snort.init
+++ b/package/snort/files/snort.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	snort $snort_flags
+	/usr/sbin/snort $snort_flags
 	;;
 stop)
-	pkill snort
+	kill $(pgrep -f /usr/sbin/snort)
 	;;
 *)
 	echo "usage: $0 {start | stop | restart}"
diff --git a/package/srelay/files/srelay.init b/package/srelay/files/srelay.init
index d7aa908f5..090a0534b 100644
--- a/package/srelay/files/srelay.init
+++ b/package/srelay/files/srelay.init
@@ -12,10 +12,10 @@ autostart)
 	;;
 start)
 	[ -f /etc/srelay.conf ] || exit 1
-	srelay ${srelay_flags}
+	/usr/bin/srelay ${srelay_flags}
 	;;
 stop)
-	pkill srelay
+	kill $(pgrep -f /usr/bin/srelay)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/subversion/files/svnserve.init b/package/subversion/files/svnserve.init
index 1cfb1e0dd..3c701e723 100644
--- a/package/subversion/files/svnserve.init
+++ b/package/subversion/files/svnserve.init
@@ -25,7 +25,7 @@ start)
 	/usr/bin/svnserve -d -r $svnserve_path
 	;;
 stop)
-	pkill svnserve
+	kill $(pgrep -f /usr/bin/svnserve)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/syslog-ng/files/syslog-ng.init b/package/syslog-ng/files/syslog-ng.init
index 2cc6ab8b6..c062d0bc8 100644
--- a/package/syslog-ng/files/syslog-ng.init
+++ b/package/syslog-ng/files/syslog-ng.init
@@ -15,10 +15,10 @@ start)
 	  echo "/etc/syslog-ng/syslog-ng.conf does not exist !";
 	  exit 0;
 	};
-	[ -x /usr/sbin/syslog-ng ] && /usr/sbin/syslog-ng
+	/usr/sbin/syslog-ng
 	;;
 stop)
-	pkill syslog-ng
+	kill $(pgrep -f /usr/sbin/syslog-ng)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/tinyproxy/files/tinyproxy.init b/package/tinyproxy/files/tinyproxy.init
index cdf86e049..d3c92fc65 100644
--- a/package/tinyproxy/files/tinyproxy.init
+++ b/package/tinyproxy/files/tinyproxy.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	tinyproxy
+	/usr/sbin/tinyproxy
 	;;
 stop)
-	pkill tinyproxy
+	kill $(pgrep -f /usr/sbin/tinyproxy)
 	rm /var/run/tinyproxy.pid
 	;;
 restart)
diff --git a/package/tor/files/tor.init b/package/tor/files/tor.init
index 5bcca701a..4432ad5cf 100644
--- a/package/tor/files/tor.init
+++ b/package/tor/files/tor.init
@@ -14,10 +14,10 @@ start)
 	[ -d /var/run/tor ] || mkdir -p /var/run/tor
 	[ -d /tmp/.tor ] || mkdir -p /tmp/.tor
 	chown tor:tor /tmp/.tor /var/run/tor
-	su - tor -c tor
+	su - tor -c /usr/bin/tor
 	;;
 stop)
-	pkill tor
+	kill $(pgrep -f /usr/bin/tor)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/ulogd/files/ulogd.init b/package/ulogd/files/ulogd.init
index ef8b8c3fb..b4c19e1bb 100644
--- a/package/ulogd/files/ulogd.init
+++ b/package/ulogd/files/ulogd.init
@@ -11,7 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	ulogd -d
+	/usr/sbin/ulogd -d
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/ulogd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/uvd/files/uvd.init b/package/uvd/files/uvd.init
index a8b54255f..14ec12c30 100644
--- a/package/uvd/files/uvd.init
+++ b/package/uvd/files/uvd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	uvd
+	/usr/sbin/uvd
 	;;
 stop)
-	pkill uvd	
+	kill $(pgrep -f /usr/sbin/uvd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/vrrpd/files/vrrpd.init b/package/vrrpd/files/vrrpd.init
index 9e8170643..6c23e75db 100644
--- a/package/vrrpd/files/vrrpd.init
+++ b/package/vrrpd/files/vrrpd.init
@@ -6,22 +6,22 @@
 
 case $1 in
 autostop) ;;
-	autostart)
-		test x"${vrrpd:-NO}" = x"NO" && exit 0
-		exec sh $0 start
-		;;
-	start)
-		vrrpd $vrrpd_flags
-		;;
-	stop)
-		pkill vrrpd
-		;;
-	restart)
-		sh $0 stop
-		sh $0 start
-		;;
-	 *)
-		echo "usage: $0 {start | stop | restart}"
-		exit 1
+autostart)
+	test x"${vrrpd:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/vrrpd $vrrpd_flags
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/vrrpd)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+ *)
+	echo "usage: $0 {start | stop | restart}"
+	exit 1
 esac
 exit $?
diff --git a/package/vsftpd/files/vsftpd.init b/package/vsftpd/files/vsftpd.init
index 7bc01c965..866c1ba8d 100644
--- a/package/vsftpd/files/vsftpd.init
+++ b/package/vsftpd/files/vsftpd.init
@@ -12,10 +12,10 @@ autostart)
 	;;
 start)
 	[ -d /var/run/vsftpd ] || mkdir -p /var/run/vsftpd
-	vsftpd
+	/usr/sbin/vsftpd
   	;;
 stop)
-	pkill vsftpd
+	kill $(pgrep -f /usr/sbin/vsftpd)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/watchdog/files/watchdog.init b/package/watchdog/files/watchdog.init
index 5c3351d6b..6e104fbcf 100644
--- a/package/watchdog/files/watchdog.init
+++ b/package/watchdog/files/watchdog.init
@@ -14,7 +14,7 @@ start)
 	/usr/sbin/watchdog
 	;;
 stop)
-	pkill watchdog
+	kill $(pgrep -f /usr/sbin/watchdog)
   	;;
 restart)
 	sh $0 stop
diff --git a/package/xinetd/files/xinetd.init b/package/xinetd/files/xinetd.init
index a7a7db8d5..6f35a5ccf 100644
--- a/package/xinetd/files/xinetd.init
+++ b/package/xinetd/files/xinetd.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	xinetd
+	/usr/sbin/xinetd
 	;;
 stop)
-	pkill xinetd
+	kill $(pgrep -f /usr/sbin/xinetd)
 	;;
 restart)
 	sh $0 stop
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 28a2e31c6..f4367e7e3 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -130,12 +130,12 @@ if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then
 fi
 
 if [[ -n $NEED_GETTEXT ]]; then
-	if ! which xgettext >/dev/null 2>&1; then
-		echo >&2 You need gettext to build $NEED_GETTEXT
-		out=1
-	elif ! which msgfmt >/dev/null 2>&1; then
+	if ! which gettext >/dev/null 2>&1; then
 		echo >&2 You need gettext to build $NEED_GETTEXT
 		out=1
+#	elif ! which msgfmt >/dev/null 2>&1; then
+#		echo >&2 You need msgfmt to build $NEED_GETTEXT
+#		out=1
 	fi
 fi