# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1203603351 -3600
# Node ID 2be2a3822f0242ac43ae768f522a012a168c6573
# Parent  edd6a8c09e3be520c4d938779deb64c8df54e9e8
Extract moved directories from squashfs too

diff -r edd6a8c09e3b -r 2be2a3822f02 tazlito
--- a/tazlito	Wed Feb 20 14:05:21 2008 +0100
+++ b/tazlito	Thu Feb 21 15:15:51 2008 +0100
@@ -443,6 +443,10 @@
 		status
 		echo -n "Copying isolinux files..."
 		cp -a $TMP_DIR/boot/isolinux $TARGET/rootcd/boot
+		for i in $(ls $TMP_DIR); do
+			[ "$i" = "boot" ] && continue
+			cp -a $TMP_DIR/$i $TARGET/rootcd
+		done
 		status
 		if [ -d $TMP_DIR/boot/syslinux ]; then
 			echo -n "Copying syslinux files..."
@@ -472,10 +476,12 @@
 		# unpack /usr
 		if [ -f .usr.sqfs ]; then
 			echo -en "\nUnsquashfs'ing /usr... "
-			/sbin/unsquashfs .usr.sqfs
+			sbin/unsquashfs .usr.sqfs
+			rm .usr.sqfs
 			if [ -d squashfs-root/.moved ]; then
-				( cd squashfs-root/.moved ; find * -type f -print ) | \
-				while read $file; do
+				( cd squashfs-root/.moved ; find * -print ) | \
+				while read file; do
+					[ -L $file ] || continue
 					rm -f $file
 					mv squashfs-root/.moved/$file $file
 				done