wok-current rev 18590

busybox: do not start apache httpd (thanks llev)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Nov 13 10:54:50 2015 +0100 (2015-11-13)
parents 74315f5518fa
children 06c9ab3aa2fa
files busybox/stuff/daemon busybox/stuff/inetd.conf
line diff
     1.1 --- a/busybox/stuff/daemon	Fri Nov 13 02:44:43 2015 +0200
     1.2 +++ b/busybox/stuff/daemon	Fri Nov 13 10:54:50 2015 +0100
     1.3 @@ -10,6 +10,13 @@
     1.4  NAME=$(basename $0)
     1.5  DESC="$NAME deamon"
     1.6  DAEMON=$(which $NAME)
     1.7 +for p in ${PATH//:/ }; do
     1.8 +	[ -L $p/$NAME ] || continue
     1.9 +	case "$(readlink $p/$NAME)" in
    1.10 +	*busybox)	DAEMON=$p/$NAME
    1.11 +			break
    1.12 +	esac
    1.13 +done
    1.14  eval $(grep -i ^${NAME}_OPTIONS /etc/daemons.conf | sed 's/.*_OPT/OPT/')
    1.15  PIDFILE=/var/run/$NAME.pid
    1.16  
     2.1 --- a/busybox/stuff/inetd.conf	Fri Nov 13 02:44:43 2015 +0200
     2.2 +++ b/busybox/stuff/inetd.conf	Fri Nov 13 10:54:50 2015 +0100
     2.3 @@ -26,10 +26,10 @@
     2.4  
     2.5  # These are standard services.
     2.6  #
     2.7 -tftp	dgram	udp	wait	root	tftpd	tftpd -r /boot
     2.8 -#systat	stream	tcp	nowait	nobody	ps -auwwx
     2.9 -#netstat	stream	tcp	nowait	root	netstat	netstat	-a
    2.10 -#http	stream	tcp	nowait	root	httpd	httpd	-i -u 80:80
    2.11 -#ftp	stream	tcp	nowait	root	ftpd	ftpd	-w /home/ftp
    2.12 -#printer	stream	tcp	nowait	root	lpd	lpd	/var/spool/lpd
    2.13 -#telnet	stream	tcp	nowait	root	telnetd	telnetd	-i
    2.14 +tftp	dgram	udp	wait	root	/usr/sbin/tftpd	tftpd -r /boot
    2.15 +#systat	stream	tcp	nowait	nobody	/sbin/ps -auwwx
    2.16 +#netstat	stream	tcp	nowait	root	/bin/netstat	netstat	-a
    2.17 +#http	stream	tcp	nowait	root	/usr/sbin/httpd	httpd	-i -u 80:80
    2.18 +#ftp	stream	tcp	nowait	root	/usr/sbin/ftpd	ftpd	-w /home/ftp
    2.19 +#printer	stream	tcp	nowait	root	/usr/bin/lpd	lpd	/var/spool/lpd
    2.20 +#telnet	stream	tcp	nowait	root	/usr/sbin/telnetd	telnetd	-i