tazlito rev 227

tazlito iso2flavor: fix flavor path
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jul 08 16:45:59 2011 +0200 (2011-07-08)
parents df8acad3c50b
children 5e331da90a7a
files tazlito
line diff
     1.1 --- a/tazlito	Mon Jun 20 12:53:55 2011 +0200
     1.2 +++ b/tazlito	Fri Jul 08 16:45:59 2011 +0200
     1.3 @@ -1073,8 +1073,9 @@
     1.4  	for i in $1$INSTALLED/*/volatile.cpio.gz; do
     1.5  		[ -e $i ] || continue
     1.6  		mkdir /tmp/volatile$$
     1.7 -		zcat $i | ( cd /tmp/volatile$$ ; cpio -idmu > /dev/null )
     1.8 -		( cd /tmp/volatile$$ ; find * -type f ) | while read file ; do
     1.9 +		zcat $i | ( cd /tmp/volatile$$ ; cpio -idmu > /dev/null 2>&1 )
    1.10 +		( cd /tmp/volatile$$ ; find * -type f 2> /dev/null) | \
    1.11 +		while read file ; do
    1.12  			[ -e $1/$file ] || continue
    1.13  			cmp -s /tmp/volatile$$/$file $1/$file && rm -f $1/$file
    1.14  		done
    1.15 @@ -1714,7 +1715,7 @@
    1.16  		else
    1.17  			( unlzma -c $TMP_DIR/iso/boot/rootfs.gz || \
    1.18  			  zcat $TMP_DIR/iso/boot/rootfs.gz ) | \
    1.19 -				( cd $TMP_DIR/rootfs ; cpio -idmu > /dev/null )
    1.20 +				( cd $TMP_DIR/rootfs ; cpio -idmu > /dev/null 2>&1 )
    1.21  			if [ ! -s $TMP_DIR/rootfs/etc/slitaz-release ]; then
    1.22  				echo "No file /etc/slitaz-release in /boot/rootfs.gz of iso image. Needs a non loram SliTaz iso."
    1.23  				umount -d $TMP_DIR/iso
    1.24 @@ -1765,9 +1766,9 @@
    1.25  				cat <<EOT
    1.26  Tazlito can't detect each file installed during a package post_install.
    1.27  You should extract this flavor (tazlito extract-flavor $FLAVOR),
    1.28 -check the files in /home/slitaz/flavors/$FLAVOR/rootfs tree and remove
    1.29 +check the files in /home/slitaz/flavors/$(cat /etc/slitaz-release)/$FLAVOR/rootfs tree and remove
    1.30  files generated by post_installs.
    1.31 -Check /home/slitaz/flavors/$FLAVOR/receipt too and repack the flavor
    1.32 +Check /home/slitaz/flavors/$(cat /etc/slitaz-release)/$FLAVOR/receipt too and repack the flavor
    1.33  (tazlito pack-flavor $FLAVOR)
    1.34  EOT
    1.35  			fi