# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1269864684 -7200
# Node ID 6bc53204ac6d214b3f8730b8c95612229e3019ab
# Parent  334fc8776b5ad5b50c3f2c7a9468bd5285eb21c8
Add rootfs extra files in meta-flavors

diff -r 334fc8776b5a -r 6bc53204ac6d tazlito
--- a/tazlito	Sun Mar 28 18:30:39 2010 +0200
+++ b/tazlito	Mon Mar 29 14:11:24 2010 +0200
@@ -798,7 +798,6 @@
 		mv /\$i \$path\$i 
 	done
 fi
-insmod /lib/squashfs.ko.gz
 
 else				# loram-cdrom
 
@@ -824,7 +823,7 @@
 	i=\$((i+1))
 done
 path=/mnt/.cdrom/
-copy_rootfs && insmod /lib/squashfs.ko.gz && umount -d /mnt/.cdrom
+copy_rootfs && umount -d /mnt/.cdrom
 
 fi
 
@@ -840,6 +839,7 @@
 	if [ -f /bin/cromfs-driver ]; then
 		cromfs-driver \${path}root\$fs /mnt/.\$fs -o ro,dev,suid,allow_other
 	else
+		insmod /lib/squashfs.ko.gz 2> /dev/null
 		mount -o loop,ro -t squashfs \${path}root\$fs /mnt/.\$fs
 	fi
 done
@@ -1792,7 +1792,8 @@
 				n=$(($n+1))
 				echo "Building $flavor rootfs..."
 				download $flavor.flavor
-				zcat $flavor.flavor | cpio -i $flavor.pkglist
+				zcat $flavor.flavor | cpio -i \
+					$flavor.pkglist $flavor.rootfs
 				sed 's/.*/&.tazpkg/' < $flavor.pkglist \
 					> $DISTRO/list-packages0$n
 				mkdir ${ROOTFS}0$n
@@ -1802,6 +1803,11 @@
 				rm -rf ${ROOTFS}0$n/boot
 				status
 				cd $DISTRO
+				if [ -s $flavor.rootfs ]; then
+					echo "Add $flavor rootfs extra files..."
+					zcat $flavor.rootfs | \
+					( cd ${ROOTFS}0$n ; cpio -idmu )
+				fi
 				mv $flavor.pkglist ${ROOTFS}0$n/etc/tazlito/distro-packages.list
 				rm -f $flavor.flavor install-list
 				mergefs ${ROOTFS}0$n $last