# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1288916719 -3600
# Node ID 2618628083de0a11f425e3a9458dafadf8d1835b
# Parent  19914b75dc51a4dc7dadd3ec3821b05bdcfdf3f7
tazwikiss: launch httpd in /etc/rcS.conf

diff -r 19914b75dc51 -r 2618628083de tazwikiss/receipt
--- a/tazwikiss/receipt	Fri Nov 05 01:05:36 2010 +0100
+++ b/tazwikiss/receipt	Fri Nov 05 01:25:19 2010 +0100
@@ -64,16 +64,16 @@
 			cat > $1/etc/httpd.conf <<EOT
 H:/var/www
 A:0.0.0.0/0
-*.sh:/bin/sh
 EOT
 		fi
 		while read line; do
-			grep -q "$line" $1/etc/httpd.conf || continue
+			grep -q "$line" $1/etc/httpd.conf && continue
 			echo "$line" >> $1/etc/httpd.conf
 		done <<EOT
-I:index.sh
 *.sh:/bin/sh
 EOT
+		grep -q ' httpd ' $1/etc/rcS.conf ||
+		sed -i 's/ slim"/ httpd slim"/' $1/etc/rcS.conf
 		if [ -z "$1" ]; then
 			# Start Web server.
 			/etc/init.d/httpd stop