wok-tiny rev 74

base: use host chpasswd
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Mar 08 16:23:14 2012 +0100 (2012-03-08)
parents dfcc18154c9e
children b5cba588c960
files base-tiny/receipt jssame/stuff/index.html
line diff
     1.1 --- a/base-tiny/receipt	Sat Jan 21 12:51:08 2012 +0100
     1.2 +++ b/base-tiny/receipt	Thu Mar 08 16:23:14 2012 +0100
     1.3 @@ -28,11 +28,14 @@
     1.4  busybox			/etc/inetd.conf
     1.5  slitaz-base-files	/etc/fstab
     1.6  slitaz-base-files	/etc/group
     1.7 +slitaz-base-files	/etc/passwd
     1.8 +slitaz-base-files	/etc/shadow
     1.9  slitaz-boot-scripts	/etc/inittab
    1.10  slitaz-boot-scripts	/etc/network.conf
    1.11  slitaz-boot-scripts	/etc/init.d/local.sh
    1.12  slitaz-boot-scripts	/etc/rcS.conf
    1.13  EOT
    1.14 +	sed -i 's/:x:/:!:/' fs/etc/passwd
    1.15  	sed -i 's/UDEV=.*/UDEV="no"/;s/hwconf.sh l/l/' fs/etc/rcS.conf
    1.16  }
    1.17  
    1.18 @@ -121,9 +124,14 @@
    1.19  	       -e "s/^DHCP=.*/DHCP=\"$DHCP\"/" \
    1.20  	       -e "s/^IP=.*/IP=\"$IP\"/" $1/etc/network.conf
    1.21  	if [ -n "$PASSWORD" ]; then
    1.22 -		chroot $1/ "echo 'root:$PASSWORD' | chpasswd"
    1.23 +		mkdir $1/lib
    1.24 +		cp -a /lib/lib[cm][.-]* /lib/ld* $1/lib
    1.25 +		cp -a /bin/busybox $1/lib/chpasswd
    1.26 +		echo "root:$PASSWORD" | chroot $1/ /lib/chpasswd -m
    1.27 +		rm -rf $1/lib
    1.28  	else
    1.29  		sed -i 's/^root:[^:]*:/root::/' $1/etc/passwd
    1.30 +		mkdir $1/root 2> /dev/null
    1.31  		cat > $1/root/.profile <<EOT
    1.32  grep -qs ^root:: /etc/passwd /etc/shadow && passwd
    1.33  EOT
     2.1 --- a/jssame/stuff/index.html	Sat Jan 21 12:51:08 2012 +0100
     2.2 +++ b/jssame/stuff/index.html	Thu Mar 08 16:23:14 2012 +0100
     2.3 @@ -8,10 +8,7 @@
     2.4  	border: none;
     2.5  	font-size: 14px;
     2.6  }
     2.7 -a {
     2.8 -	color: black;
     2.9 -	text-decoration: none;
    2.10 -}
    2.11 +a { text-decoration: none; }
    2.12  </style>
    2.13  <script language="javascript">
    2.14  <!-- // Original:  Jason Fondren (usher@betterbox.net) http://www.oogha.com/