wok diff busybox/receipt @ rev 15390

Up slitaz-boot-scripts (5.3.2)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Oct 30 18:29:11 2013 +0100 (2013-10-30)
parents a4254bd509cd
children 73d80d561b42
line diff
     1.1 --- a/busybox/receipt	Sat Jun 29 17:32:45 2013 +0200
     1.2 +++ b/busybox/receipt	Wed Oct 30 18:29:11 2013 +0100
     1.3 @@ -119,38 +119,38 @@
     1.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     1.5  genpkg_rules()
     1.6  {
     1.7 -    cp -a $src/_install/* $fs
     1.8 -    rm -f $fs/bin/bbconfig $fs/usr/bin/ar
     1.9 -    mkdir -p $fs/etc/init.d $fs/var/spool/cron/crontabs
    1.10 +	cp -a $src/_install/* $fs
    1.11 +	rm -f $fs/bin/bbconfig $fs/usr/bin/ar
    1.12 +	mkdir -p $fs/etc/init.d $fs/var/spool/cron/crontabs $fs/var/spool/lpd
    1.13  
    1.14 -    # Busybox config files.
    1.15 -    for f in busybox.conf dnsd.conf udhcpd.conf inetd.conf httpd.conf \
    1.16 -    	     syslog.conf zcip.script
    1.17 -    do
    1.18 +	# Busybox config files.
    1.19 +	for f in busybox.conf dnsd.conf udhcpd.conf inetd.conf httpd.conf \
    1.20 +		syslog.conf zcip.script
    1.21 +	do
    1.22  		cp $stuff/$f $fs/etc
    1.23 -    done
    1.24 -    chown -R 0.0 $fs/etc
    1.25 -    chmod 600 $fs/etc/busybox.conf
    1.26 -    touch $fs/etc/resolv.conf
    1.27 +	done
    1.28 +	chown -R 0.0 $fs/etc
    1.29 +	chmod 600 $fs/etc/busybox.conf
    1.30 +	touch $fs/etc/resolv.conf
    1.31  
    1.32 -    # Daemon scripts.
    1.33 -    cp $stuff/daemon $fs/etc/init.d
    1.34 -    DAEMON="crond dnsd ftpd httpd inetd klogd ntpd syslogd telnetd tftpd udhcpd zcip"
    1.35 -    for i in $DAEMON; do
    1.36 +	# Daemon scripts.
    1.37 +	cp $stuff/daemon $fs/etc/init.d
    1.38 +	DAEMON="crond dnsd ftpd httpd inetd lpd klogd ntpd syslogd telnetd tftpd udhcpd zcip"
    1.39 +	for i in $DAEMON; do
    1.40  		grep -qi config_$i=y $stuff/$PACKAGE-${VERSION%.*}.config &&
    1.41  		ln -s daemon $fs/etc/init.d/$i
    1.42 -    done
    1.43 -    rm $fs/linuxrc
    1.44 -    mkdir -p $fs/etc/modprobe.d
    1.45 +	done
    1.46 +	rm $fs/linuxrc
    1.47 +	mkdir -p $fs/etc/modprobe.d
    1.48  
    1.49 -    # Udhcpc stuff.
    1.50 -    mkdir -p $fs/usr/share/udhcpc
    1.51 -    cp $stuff/udhcp.script $fs/usr/share/udhcpc/default.script
    1.52 -    chmod +x $fs/usr/share/udhcpc/default.script
    1.53 +	# Udhcpc stuff.
    1.54 +	mkdir -p $fs/usr/share/udhcpc
    1.55 +	cp $stuff/udhcp.script $fs/usr/share/udhcpc/default.script
    1.56 +	chmod +x $fs/usr/share/udhcpc/default.script
    1.57  
    1.58 -    # Httpd stuff.
    1.59 -    ln -s /usr/lib/slitaz/httphelper.sh $fs/usr/bin/httpd_helper.sh
    1.60 -    cp -a $stuff/www $fs/var
    1.61 +	# Httpd stuff.
    1.62 +	ln -s /usr/lib/slitaz/httphelper.sh $fs/usr/bin/httpd_helper.sh
    1.63 +	cp -a $stuff/www $fs/var
    1.64  }
    1.65  
    1.66  # GNU utils stuff.
    1.67 @@ -200,11 +200,6 @@
    1.68  		echo 'TFTPD_OPTIONS="-r /boot"' >> $root/etc/daemons.conf
    1.69  		echo '' >> $root/etc/daemons.conf
    1.70  	fi
    1.71 -	if ! grep -q ^HTTPD_OPTIONS $root/etc/daemons.conf; then
    1.72 -		echo '# Busybox HTTP web server options.' >> $root/etc/daemons.conf
    1.73 -		echo 'HTTPD_OPTIONS="-u www"' >> $root/etc/daemons.conf
    1.74 -		echo '' >> $root/etc/daemons.conf
    1.75 -	fi
    1.76  }
    1.77  
    1.78  pre_remove()