# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1374153063 0
# Node ID a592b36892bace88aa92dbf7b73e6d11b714cdf5
# Parent  efbd89023863d073bc7c27ce2b6a371c846d76c2
base-tiny: may reuse passwd

diff -r efbd89023863 -r a592b36892ba base-tiny/receipt
--- a/base-tiny/receipt	Thu Jul 18 10:39:23 2013 +0000
+++ b/base-tiny/receipt	Thu Jul 18 13:11:03 2013 +0000
@@ -30,6 +30,7 @@
 slitaz-base-files	/etc/fstab
 slitaz-base-files	/etc/group
 slitaz-base-files	/etc/passwd
+slitaz-base-files	/etc/gshadow
 slitaz-base-files	/etc/shadow
 slitaz-boot-scripts	/etc/inittab
 slitaz-boot-scripts	/etc/network.conf
@@ -60,7 +61,7 @@
 	cat <<EOT
 <table>
 <tr>
-<td>Root password</td>
+<td>Root password (empty=disable)</td>
 <td><input type="text" name="PASSWORD" value="$PASSWORD" /></td>
 </tr>
 <tr>
@@ -130,11 +131,16 @@
 	       -e "s/^DHCP=.*/DHCP=\"$DHCP\"/" \
 	       -e "s/^IP=.*/IP=\"$IP\"/" $1/etc/network.conf
 	if [ -n "$PASSWORD" ]; then
-		mkdir $1/lib
-		cp -a /lib/lib[cm][.-]* /lib/ld* $1/lib
-		cp -a /bin/busybox $1/lib/chpasswd
-		echo "root:$PASSWORD" | chroot $1/ /lib/chpasswd -m
-		rm -rf $1/lib
+		case "$PASSWORD" in
+		\$1\$*)
+			sed -i "s|^root:[^:]*|root:$PASSWORD|" $1/etc/shadow ;;
+		*)
+			mkdir $1/lib
+			cp -a /lib/lib[cm][.-]* /lib/ld* $1/lib
+			cp -a /bin/busybox $1/lib/chpasswd
+			echo "root:$PASSWORD" | chroot $1/ /lib/chpasswd -m
+			rm -rf $1/lib
+		esac
 	else
 		sed -i 's/^root:[^:]*:/root::/' $1/etc/passwd
 		mkdir $1/root 2> /dev/null
diff -r efbd89023863 -r a592b36892ba kernel-modular/receipt
--- a/kernel-modular/receipt	Thu Jul 18 10:39:23 2013 +0000
+++ b/kernel-modular/receipt	Thu Jul 18 13:11:03 2013 +0000
@@ -86,7 +86,7 @@
 	cd ../..
 
 	# Build bzImage without modules first
-	for i in isa lguest ; do
+	for i in isa lguest usbstorage fb ; do
 		cp -f ../stuff/$SOURCE-$VERSION-slitaz.config-$TARGET-$i .config
 		# We can't keep every driver in staging 
 		sed -i -e 's/^CONFIG_RTL8192/#&/' \
diff -r efbd89023863 -r a592b36892ba nanochess/receipt
--- a/nanochess/receipt	Thu Jul 18 10:39:23 2013 +0000
+++ b/nanochess/receipt	Thu Jul 18 13:11:03 2013 +0000
@@ -21,7 +21,7 @@
 	mkdir -p $src 2> /dev/null
 	cd $src
 	wget -O index.html \
-		$(dirname $WEB_SITE)/archive/toledo_javascript_chess_3.html
+		$WEB_SITE/archive/toledo_javascript_chess_3.html
 	sed -i -e 's/<select/<input type=\\"button\\" value=\\"\&#9818; \&hArr; \&#9812;\\" onclick=\\"yy^=8;Z()\\">&/' \
 	  -e 's/><option.*$/>";/' -e "s/ style='font-size:20px'//" \
 	  -e 's/50px/"+P+"px/g' -e 's/=60/="+H+"/g' \
diff -r efbd89023863 -r a592b36892ba p910nd/receipt
--- a/p910nd/receipt	Thu Jul 18 10:39:23 2013 +0000
+++ b/p910nd/receipt	Thu Jul 18 13:11:03 2013 +0000
@@ -39,7 +39,8 @@
 	echo "$DEVICES" | dos2unix | awk '{ if ($1 != "") printf \
 "%d	stream	tcp	nowait	root	%s %s -b -f %s\n", 9100 + n++, \
 "/usr/sbin/p910nd", "/usr/sbin/p910nd", $1 }' >> $1/etc/inetd.conf
-	for dev in $(cat $DEVICES | dos2unix); do
+	mkdir $1/dev
+	for dev in $(echo $DEVICES | dos2unix); do
 		mknod -m 660 $1$dev c 6 ${dev#*lp}
 	done
 }
diff -r efbd89023863 -r a592b36892ba rsync/receipt
--- a/rsync/receipt	Thu Jul 18 10:39:23 2013 +0000
+++ b/rsync/receipt	Thu Jul 18 13:11:03 2013 +0000
@@ -54,7 +54,7 @@
 	[ -n "$RSYNCD_SECRETS" ] || RSYNCD_SECRETS="$(cat $1/etc/rsyncd.secrets)"
 	cat <<EOT
 <p>
-<input type="checkbox" name="START" > start rsync daemon during boot
+<input type="checkbox" name="START" $START> start rsync daemon during boot
 </p>
 <fieldset>
 <legend><i>/etc/rsyncd.conf</i></legend>