tazlito diff tazlito @ rev 179
Add rootfs extra files in meta-flavors
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Mar 29 14:11:24 2010 +0200 (2010-03-29) |
parents | 334fc8776b5a |
children | e03bd09092a6 |
line diff
1.1 --- a/tazlito Sun Mar 28 18:30:39 2010 +0200 1.2 +++ b/tazlito Mon Mar 29 14:11:24 2010 +0200 1.3 @@ -798,7 +798,6 @@ 1.4 mv /\$i \$path\$i 1.5 done 1.6 fi 1.7 -insmod /lib/squashfs.ko.gz 1.8 1.9 else # loram-cdrom 1.10 1.11 @@ -824,7 +823,7 @@ 1.12 i=\$((i+1)) 1.13 done 1.14 path=/mnt/.cdrom/ 1.15 -copy_rootfs && insmod /lib/squashfs.ko.gz && umount -d /mnt/.cdrom 1.16 +copy_rootfs && umount -d /mnt/.cdrom 1.17 1.18 fi 1.19 1.20 @@ -840,6 +839,7 @@ 1.21 if [ -f /bin/cromfs-driver ]; then 1.22 cromfs-driver \${path}root\$fs /mnt/.\$fs -o ro,dev,suid,allow_other 1.23 else 1.24 + insmod /lib/squashfs.ko.gz 2> /dev/null 1.25 mount -o loop,ro -t squashfs \${path}root\$fs /mnt/.\$fs 1.26 fi 1.27 done 1.28 @@ -1792,7 +1792,8 @@ 1.29 n=$(($n+1)) 1.30 echo "Building $flavor rootfs..." 1.31 download $flavor.flavor 1.32 - zcat $flavor.flavor | cpio -i $flavor.pkglist 1.33 + zcat $flavor.flavor | cpio -i \ 1.34 + $flavor.pkglist $flavor.rootfs 1.35 sed 's/.*/&.tazpkg/' < $flavor.pkglist \ 1.36 > $DISTRO/list-packages0$n 1.37 mkdir ${ROOTFS}0$n 1.38 @@ -1802,6 +1803,11 @@ 1.39 rm -rf ${ROOTFS}0$n/boot 1.40 status 1.41 cd $DISTRO 1.42 + if [ -s $flavor.rootfs ]; then 1.43 + echo "Add $flavor rootfs extra files..." 1.44 + zcat $flavor.rootfs | \ 1.45 + ( cd ${ROOTFS}0$n ; cpio -idmu ) 1.46 + fi 1.47 mv $flavor.pkglist ${ROOTFS}0$n/etc/tazlito/distro-packages.list 1.48 rm -f $flavor.flavor install-list 1.49 mergefs ${ROOTFS}0$n $last