# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1503134946 -7200
# Node ID d67c3806871698f307d77ee08bd07e8ec8fc1f8e
# Parent  8ff519d67e94ff5f7bd2646fdcbbf487a007f63f
tazlito: fix uncompress

diff -r 8ff519d67e94 -r d67c38068716 tazlito
--- a/tazlito	Thu Aug 17 16:11:23 2017 +0200
+++ b/tazlito	Sat Aug 19 11:29:06 2017 +0200
@@ -849,7 +849,8 @@
 # Uncompress rootfs or module to stdout
 
 uncompress() {
-	zcat $1 2> /dev/null || xzcat $1 2> /dev/null || unlzma < $1 || cat $i
+	zcat $1 2> /dev/null || xzcat $1 2> /dev/null ||
+	{ [ $(od -N 1 -An $1) -eq 135 ] && unlzma < $1; } || cat $1
 }
 
 
@@ -953,8 +954,11 @@
 		cd $TMP_DIR/fs
 		echo 'Getting slitaz-release & ethernet modules...'
 		for i in $(ls -r $TMP_DIR/iso/boot/rootfs*z); do
-			uncompress $i | cpio -idmu etc/slitaz-release lib/modules* >/dev/null
-		done
+			uncompress $i | cpio -idmu etc/slitaz-release lib/modules rootfs*
+			[ -s rootfs* ] || continue
+			unsquashfs -f -d . rootfs* rootfs* etc/slitaz-release lib/modules &&
+			rm -f rootfs*
+		done 2>&1 > /dev/null
 		cd - > /dev/null
 		cp $TMP_DIR/fs/etc/slitaz-release $TMP_DIR/initfs/etc/
 		find $TMP_DIR/fs/lib/modules/*/kernel/drivers/net/ethernet \
@@ -1054,6 +1058,7 @@
 gw
 ip
 EOT
+grep -q \$eth /proc/net/dev || sh
 if [ -n "\$ip" ]; then
 	ifconfig \$eth \$ip netmask \$netmask up
 	route add default gateway \$gw
@@ -1082,7 +1087,7 @@
 	for i in \$(echo \$URLISO | sed 's/,/ /g'); do
 		httpfs \$i \$path2 && echo \$i && break
 	done
-	mount -o loop,ro -t iso9660 \$path2/*.iso \$path
+	mount -o loop,ro -t iso9660 \$path2/*.iso \$path || sh
 done
 
 memfree=\$(grep MemFree /proc/meminfo | sed 's/[^0-9]//g')