# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1447408490 -3600
# Node ID d2c1950b6f95a05f0cabbf327a9dd47a81bc207b
# Parent  74315f5518fa222b7afba149ca50b4ff95ce1f72
busybox: do not start apache httpd (thanks llev)

diff -r 74315f5518fa -r d2c1950b6f95 busybox/stuff/daemon
--- a/busybox/stuff/daemon	Fri Nov 13 02:44:43 2015 +0200
+++ b/busybox/stuff/daemon	Fri Nov 13 10:54:50 2015 +0100
@@ -10,6 +10,13 @@
 NAME=$(basename $0)
 DESC="$NAME deamon"
 DAEMON=$(which $NAME)
+for p in ${PATH//:/ }; do
+	[ -L $p/$NAME ] || continue
+	case "$(readlink $p/$NAME)" in
+	*busybox)	DAEMON=$p/$NAME
+			break
+	esac
+done
 eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/')
 PIDFILE=/var/run/$NAME.pid
 
diff -r 74315f5518fa -r d2c1950b6f95 busybox/stuff/inetd.conf
--- a/busybox/stuff/inetd.conf	Fri Nov 13 02:44:43 2015 +0200
+++ b/busybox/stuff/inetd.conf	Fri Nov 13 10:54:50 2015 +0100
@@ -26,10 +26,10 @@
 
 # These are standard services.
 #
-tftp	dgram	udp	wait	root	tftpd	tftpd -r /boot
-#systat	stream	tcp	nowait	nobody	ps -auwwx
-#netstat	stream	tcp	nowait	root	netstat	netstat	-a
-#http	stream	tcp	nowait	root	httpd	httpd	-i -u 80:80
-#ftp	stream	tcp	nowait	root	ftpd	ftpd	-w /home/ftp
-#printer	stream	tcp	nowait	root	lpd	lpd	/var/spool/lpd
-#telnet	stream	tcp	nowait	root	telnetd	telnetd	-i
+tftp	dgram	udp	wait	root	/usr/sbin/tftpd	tftpd -r /boot
+#systat	stream	tcp	nowait	nobody	/sbin/ps -auwwx
+#netstat	stream	tcp	nowait	root	/bin/netstat	netstat	-a
+#http	stream	tcp	nowait	root	/usr/sbin/httpd	httpd	-i -u 80:80
+#ftp	stream	tcp	nowait	root	/usr/sbin/ftpd	ftpd	-w /home/ftp
+#printer	stream	tcp	nowait	root	/usr/bin/lpd	lpd	/var/spool/lpd
+#telnet	stream	tcp	nowait	root	/usr/sbin/telnetd	telnetd	-i