wok-tiny rev 92

base-tiny: may reuse passwd
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jul 18 13:11:03 2013 +0000 (2013-07-18)
parents efbd89023863
children a3e929634247
files base-tiny/receipt kernel-modular/receipt nanochess/receipt p910nd/receipt rsync/receipt
line diff
     1.1 --- a/base-tiny/receipt	Thu Jul 18 10:39:23 2013 +0000
     1.2 +++ b/base-tiny/receipt	Thu Jul 18 13:11:03 2013 +0000
     1.3 @@ -30,6 +30,7 @@
     1.4  slitaz-base-files	/etc/fstab
     1.5  slitaz-base-files	/etc/group
     1.6  slitaz-base-files	/etc/passwd
     1.7 +slitaz-base-files	/etc/gshadow
     1.8  slitaz-base-files	/etc/shadow
     1.9  slitaz-boot-scripts	/etc/inittab
    1.10  slitaz-boot-scripts	/etc/network.conf
    1.11 @@ -60,7 +61,7 @@
    1.12  	cat <<EOT
    1.13  <table>
    1.14  <tr>
    1.15 -<td>Root password</td>
    1.16 +<td>Root password (empty=disable)</td>
    1.17  <td><input type="text" name="PASSWORD" value="$PASSWORD" /></td>
    1.18  </tr>
    1.19  <tr>
    1.20 @@ -130,11 +131,16 @@
    1.21  	       -e "s/^DHCP=.*/DHCP=\"$DHCP\"/" \
    1.22  	       -e "s/^IP=.*/IP=\"$IP\"/" $1/etc/network.conf
    1.23  	if [ -n "$PASSWORD" ]; then
    1.24 -		mkdir $1/lib
    1.25 -		cp -a /lib/lib[cm][.-]* /lib/ld* $1/lib
    1.26 -		cp -a /bin/busybox $1/lib/chpasswd
    1.27 -		echo "root:$PASSWORD" | chroot $1/ /lib/chpasswd -m
    1.28 -		rm -rf $1/lib
    1.29 +		case "$PASSWORD" in
    1.30 +		\$1\$*)
    1.31 +			sed -i "s|^root:[^:]*|root:$PASSWORD|" $1/etc/shadow ;;
    1.32 +		*)
    1.33 +			mkdir $1/lib
    1.34 +			cp -a /lib/lib[cm][.-]* /lib/ld* $1/lib
    1.35 +			cp -a /bin/busybox $1/lib/chpasswd
    1.36 +			echo "root:$PASSWORD" | chroot $1/ /lib/chpasswd -m
    1.37 +			rm -rf $1/lib
    1.38 +		esac
    1.39  	else
    1.40  		sed -i 's/^root:[^:]*:/root::/' $1/etc/passwd
    1.41  		mkdir $1/root 2> /dev/null
     2.1 --- a/kernel-modular/receipt	Thu Jul 18 10:39:23 2013 +0000
     2.2 +++ b/kernel-modular/receipt	Thu Jul 18 13:11:03 2013 +0000
     2.3 @@ -86,7 +86,7 @@
     2.4  	cd ../..
     2.5  
     2.6  	# Build bzImage without modules first
     2.7 -	for i in isa lguest ; do
     2.8 +	for i in isa lguest usbstorage fb ; do
     2.9  		cp -f ../stuff/$SOURCE-$VERSION-slitaz.config-$TARGET-$i .config
    2.10  		# We can't keep every driver in staging 
    2.11  		sed -i -e 's/^CONFIG_RTL8192/#&/' \
     3.1 --- a/nanochess/receipt	Thu Jul 18 10:39:23 2013 +0000
     3.2 +++ b/nanochess/receipt	Thu Jul 18 13:11:03 2013 +0000
     3.3 @@ -21,7 +21,7 @@
     3.4  	mkdir -p $src 2> /dev/null
     3.5  	cd $src
     3.6  	wget -O index.html \
     3.7 -		$(dirname $WEB_SITE)/archive/toledo_javascript_chess_3.html
     3.8 +		$WEB_SITE/archive/toledo_javascript_chess_3.html
     3.9  	sed -i -e 's/<select/<input type=\\"button\\" value=\\"\&#9818; \&hArr; \&#9812;\\" onclick=\\"yy^=8;Z()\\">&/' \
    3.10  	  -e 's/><option.*$/>";/' -e "s/ style='font-size:20px'//" \
    3.11  	  -e 's/50px/"+P+"px/g' -e 's/=60/="+H+"/g' \
     4.1 --- a/p910nd/receipt	Thu Jul 18 10:39:23 2013 +0000
     4.2 +++ b/p910nd/receipt	Thu Jul 18 13:11:03 2013 +0000
     4.3 @@ -39,7 +39,8 @@
     4.4  	echo "$DEVICES" | dos2unix | awk '{ if ($1 != "") printf \
     4.5  "%d	stream	tcp	nowait	root	%s %s -b -f %s\n", 9100 + n++, \
     4.6  "/usr/sbin/p910nd", "/usr/sbin/p910nd", $1 }' >> $1/etc/inetd.conf
     4.7 -	for dev in $(cat $DEVICES | dos2unix); do
     4.8 +	mkdir $1/dev
     4.9 +	for dev in $(echo $DEVICES | dos2unix); do
    4.10  		mknod -m 660 $1$dev c 6 ${dev#*lp}
    4.11  	done
    4.12  }
     5.1 --- a/rsync/receipt	Thu Jul 18 10:39:23 2013 +0000
     5.2 +++ b/rsync/receipt	Thu Jul 18 13:11:03 2013 +0000
     5.3 @@ -54,7 +54,7 @@
     5.4  	[ -n "$RSYNCD_SECRETS" ] || RSYNCD_SECRETS="$(cat $1/etc/rsyncd.secrets)"
     5.5  	cat <<EOT
     5.6  <p>
     5.7 -<input type="checkbox" name="START" > start rsync daemon during boot
     5.8 +<input type="checkbox" name="START" $START> start rsync daemon during boot
     5.9  </p>
    5.10  <fieldset>
    5.11  <legend><i>/etc/rsyncd.conf</i></legend>