SliTaz Repositories

     1.1 --- a/tazlito	Thu Aug 17 16:11:23 2017 +0200
     1.2 +++ b/tazlito	Sat Aug 19 11:29:06 2017 +0200
     1.3 @@ -849,7 +849,8 @@
     1.4  # Uncompress rootfs or module to stdout
     1.5  
     1.6  uncompress() {
     1.7 -	zcat $1 2> /dev/null || xzcat $1 2> /dev/null || unlzma < $1 || cat $i
     1.8 +	zcat $1 2> /dev/null || xzcat $1 2> /dev/null ||
     1.9 +	{ [ $(od -N 1 -An $1) -eq 135 ] && unlzma < $1; } || cat $1
    1.10  }
    1.11  
    1.12  
    1.13 @@ -953,8 +954,11 @@
    1.14  		cd $TMP_DIR/fs
    1.15  		echo 'Getting slitaz-release & ethernet modules...'
    1.16  		for i in $(ls -r $TMP_DIR/iso/boot/rootfs*z); do
    1.17 -			uncompress $i | cpio -idmu etc/slitaz-release lib/modules* >/dev/null
    1.18 -		done
    1.19 +			uncompress $i | cpio -idmu etc/slitaz-release lib/modules rootfs*
    1.20 +			[ -s rootfs* ] || continue
    1.21 +			unsquashfs -f -d . rootfs* rootfs* etc/slitaz-release lib/modules &&
    1.22 +			rm -f rootfs*
    1.23 +		done 2>&1 > /dev/null
    1.24  		cd - > /dev/null
    1.25  		cp $TMP_DIR/fs/etc/slitaz-release $TMP_DIR/initfs/etc/
    1.26  		find $TMP_DIR/fs/lib/modules/*/kernel/drivers/net/ethernet \
    1.27 @@ -1054,6 +1058,7 @@
    1.28  gw
    1.29  ip
    1.30  EOT
    1.31 +grep -q \$eth /proc/net/dev || sh
    1.32  if [ -n "\$ip" ]; then
    1.33  	ifconfig \$eth \$ip netmask \$netmask up
    1.34  	route add default gateway \$gw
    1.35 @@ -1082,7 +1087,7 @@
    1.36  	for i in \$(echo \$URLISO | sed 's/,/ /g'); do
    1.37  		httpfs \$i \$path2 && echo \$i && break
    1.38  	done
    1.39 -	mount -o loop,ro -t iso9660 \$path2/*.iso \$path
    1.40 +	mount -o loop,ro -t iso9660 \$path2/*.iso \$path || sh
    1.41  done
    1.42  
    1.43  memfree=\$(grep MemFree /proc/meminfo | sed 's/[^0-9]//g')