tazlito rev 95

Exec distro.sh if exist and tiny cosmetic change
author Christophe Lincoln <pankso@slitaz.org>
date Sun Mar 29 23:50:23 2009 +0200 (2009-03-29)
parents a2da441d750f
children 8d4c4fb59332
files tazlito
line diff
     1.1 --- a/tazlito	Wed Mar 11 16:41:15 2009 +0000
     1.2 +++ b/tazlito	Sun Mar 29 23:50:23 2009 +0200
     1.3 @@ -314,10 +314,11 @@
     1.4  {
     1.5  	echo "Build date      : `date +%Y%m%d\ \at\ \%H:%M:%S`"
     1.6  	echo "Packages        : `ls -1 $ROOTFS$INSTALLED | wc -l`"
     1.7 -	echo "Rootfs size     : `du -sh $ROOTFS`"
     1.8 -	echo "Initramfs size  : `du -sh $ROOTCD/boot/$INITRAMFS`"
     1.9 -	echo "ISO image size  : `du -sh $ISO_NAME.iso`"
    1.10 +	echo "Rootfs size     : `du -sh $ROOTFS | awk '{ print $1 }'`"
    1.11 +	echo "Initramfs size  : `du -sh $ROOTCD/boot/$INITRAMFS | awk '{ print $1 }'`"
    1.12 +	echo "ISO image size  : `du -sh $ISO_NAME.iso | awk '{ print $1 }'`"
    1.13  	echo "================================================================================"
    1.14 +	echo "Image is ready: $ISO_NAME.iso"
    1.15  	echo ""
    1.16  }
    1.17  
    1.18 @@ -325,7 +326,7 @@
    1.19  distro_stats()
    1.20  {
    1.21  	echo ""
    1.22 -	echo -e "\033[1mDistro statistics\033[0m"
    1.23 +	echo -e "\033[1mDistro statistics\033[0m ($DISTRO)"
    1.24  	echo "================================================================================"
    1.25  	distro_sizes
    1.26  }
    1.27 @@ -920,6 +921,13 @@
    1.28  			cp -a $ADDFILES/rootcd/* $ROOTCD
    1.29  			status
    1.30  		fi
    1.31 +		# Execute the distro script (used to perform tasks in the rootfs
    1.32 +		# before compression. Give rootfs path in arg
    1.33 +		[ -z $DISTRO_SCRIPT ] && DISTRO_SCRIPT=$TOP_DIR/distro.sh
    1.34 +		if [ -x $DISTRO_SCRIPT ]; then
    1.35 +			echo "Executing distro script..."
    1.36 +			sh $DISTRO_SCRIPT $DISTRO
    1.37 +		fi
    1.38  		# Initramfs and ISO image stuff.
    1.39  		gen_initramfs
    1.40  		gen_livecd_isolinux