tazlito diff tazlito @ rev 274

tazlito: compute /md5sum always during ISO creation
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Apr 10 22:42:37 2012 +0200 (2012-04-10)
parents c46b598e48aa
children ad96fdd80b46
line diff
     1.1 --- a/tazlito	Wed Apr 04 00:25:23 2012 +0000
     1.2 +++ b/tazlito	Tue Apr 10 22:42:37 2012 +0200
     1.3 @@ -237,6 +237,15 @@
     1.4  
     1.5  create_iso()
     1.6  {
     1.7 +	cd $2
     1.8 +	echo -n "Computing md5..."
     1.9 +	find * -type f ! -name md5sum -exec md5sum {} \; > md5sum
    1.10 +	sed -i '/  boot\/isolinux\/isolinux.bin$/d' md5sum
    1.11 +	status
    1.12 +	cd - > /dev/null
    1.13 +	echo ""
    1.14 +	echo -e "\033[1mGenerating ISO image\033[0m"
    1.15 +	echo "================================================================================"
    1.16  	echo "Generating $1"
    1.17  	if [ $(ls $2/boot/vmlinuz* $2/boot/bzImage | wc -l) -eq 2 ]; then
    1.18  		if cmp $2/boot/vmlinuz* $2/boot/bzImage > /dev/null; then
    1.19 @@ -280,15 +289,7 @@
    1.20  		sed -i "s/XXXXXXXX/$DATE/" $ROOTCD/boot/isolinux/isolinux.*g
    1.21  		status
    1.22  	fi
    1.23 -	cd $ROOTCD
    1.24 -	echo -n "Computing md5..."
    1.25 -	find * -type f ! -name md5sum -exec md5sum {} \; > md5sum
    1.26 -	sed -i '/  boot\/isolinux\/isolinux.bin$/d' md5sum
    1.27 -	status
    1.28  	cd $DISTRO
    1.29 -	echo ""
    1.30 -	echo -e "\033[1mGenerating ISO image\033[0m"
    1.31 -	echo "================================================================================"
    1.32  	create_iso $ISO_NAME.iso $ROOTCD
    1.33  	echo -n "Creating the ISO md5sum..."
    1.34  	md5sum $ISO_NAME.iso > $ISO_NAME.md5
    1.35 @@ -2095,7 +2096,7 @@
    1.36  			FLAVOR_LIST="$(awk '{ for (i = 2; i <= NF; i+=2) \
    1.37  			  printf("%s ",$i) }' < /etc/tazlito/rootfs.list)"
    1.38  			sed -i "s/ *//;s/)/), flavors $FLAVOR_LIST/" \
    1.39 -			  $ROOTCD/boot/isolinux/isolinux.msg
    1.40 +			  $ROOTCD/boot/isolinux/isolinux.msg 2> /dev/null
    1.41  			[ -f $ROOTCD/boot/isolinux/ifmem.c32 ] ||
    1.42  			cp /boot/isolinux/ifmem.c32 $ROOTCD/boot/isolinux
    1.43  			n=0