tazlito rev 195
tazlito: store flavor infos in iso
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Dec 19 11:38:36 2010 +0100 (2010-12-19) |
parents | 8e3ffb7f7391 |
children | a9e5e7d1803e |
files | tazlito |
line diff
1.1 --- a/tazlito Sun Dec 19 09:56:30 2010 +0100 1.2 +++ b/tazlito Sun Dec 19 11:38:36 2010 +0100 1.3 @@ -250,6 +250,14 @@ 1.4 /usr/bin/isohybrid $1 2> /dev/null 1.5 status 1.6 fi 1.7 + if [ -s /etc/tazlito/info ]; then 1.8 + if [ $(stat -c /etc/tazlito/info) -lt $(( 31 * 1024 )) ]; then 1.9 + echo -n "Storing ISO info..." 1.10 + dd if=/etc/tazlito/info bs=1k seek=1 of=$1 \ 1.11 + conv=notrunc 2> /dev/null 1.12 + status 1.13 + fi 1.14 + fi 1.15 } 1.16 1.17 # Generate a new ISO image using isolinux. 1.18 @@ -1600,12 +1608,16 @@ 1.19 mv $TMP_DIR/$FLAVOR.nonfree non-free.list 2> /dev/null 1.20 mv $TMP_DIR/$FLAVOR.pkglist distro-packages.list 1.21 status 1.22 + infos="$FLAVOR.desc" 1.23 for i in rootcd rootfs; do 1.24 if [ -f $TMP_DIR/$FLAVOR.$i ]; then 1.25 echo -n "Adding $i... " 1.26 mkdir -p "$ADDFILES/$i" 1.27 zcat $TMP_DIR/$FLAVOR.$i | \ 1.28 ( cd "$ADDFILES/$i"; cpio -id > /dev/null) 1.29 + zcat $TMP_DIR/$FLAVOR.$i | cpio -tv \ 1.30 + > $TMP_DIR/$FLAVOR.list$i 1.31 + infos="$infos\n$FLAVOR.list$i" 1.32 fi 1.33 done 1.34 if [ -s $TMP_DIR/$FLAVOR.mirrors ]; then 1.35 @@ -1615,6 +1627,7 @@ 1.36 echo "$line" > $LOCALSTATE/undigest/$FLAVOR$n/mirror 1.37 n=$(( $n + 1 )) 1.38 done < $TMP_DIR/$FLAVOR.mirrors 1.39 + infos="$infos\n$FLAVOR.mirrors" 1.40 tazpkg recharge 1.41 fi 1.42 rm -f /etc/tazlito/rootfs.list 1.43 @@ -1628,6 +1641,8 @@ 1.44 > tazlito.conf.$$ && mv tazlito.conf.$$ tazlito.conf 1.45 sed -i "s/ISO_NAME=.*/ISO_NAME=\"slitaz-$FLAVOR\"/" tazlito.conf 1.46 status 1.47 + ( cd $TMP_DIR ; echo -e $infos | cpio -o -H newc ) \ 1.48 + gzip -9 > /etc/tazlito/info 1.49 rm -Rf $TMP_DIR 1.50 fi 1.51 echo ""