tazlito rev 485

Russian inner dolls should not overwrite /cdrom/boot
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Feb 26 08:10:41 2018 +0100 (19 months ago)
parents aa7849739d84
children bd1bde4d6cad
files tazlito
line diff
     1.1 --- a/tazlito	Sun Feb 25 17:55:06 2018 +0100
     1.2 +++ b/tazlito	Mon Feb 26 08:10:41 2018 +0100
     1.3 @@ -530,7 +530,8 @@
     1.4  
     1.5  	action 'Computing md5...'
     1.6  	touch boot/isolinux/boot.cat
     1.7 -	find * -type f ! -name md5sum ! -name 'vmlinuz-*' -exec md5sum {} \; > md5sum
     1.8 +	find * -type f ! -name md5sum ! -name 'vmlinuz-*' -exec md5sum {} \; | \
     1.9 +		sort -k 2 > md5sum
    1.10  	status
    1.11  
    1.12  	cd - >/dev/null
    1.13 @@ -601,7 +602,7 @@
    1.14  	create_iso $ISO_NAME.iso $ROOTCD
    1.15  
    1.16  	action 'Creating the ISO md5sum...'
    1.17 -	md5sum $ISO_NAME.iso > $ISO_NAME.md5
    1.18 +	md5sum $ISO_NAME.iso | sort -k 2 > $ISO_NAME.md5
    1.19  	status
    1.20  
    1.21  	separator
    1.22 @@ -2706,7 +2707,8 @@
    1.23  
    1.24  				install_list_to_rootfs "$DISTRO/list-packages0$n" "${ROOTFS}0$n"
    1.25  
    1.26 -				cp -a ${ROOTFS}0$n/boot $ROOTCD
    1.27 +				action 'Updating the boot directory...'
    1.28 +				yes n | cp -ai ${ROOTFS}0$n/boot $ROOTCD
    1.29  				rm -rf ${ROOTFS}0$n/boot
    1.30  
    1.31  				cd $DISTRO
    1.32 @@ -2942,7 +2944,7 @@
    1.33  		cd $DISTRO
    1.34  		create_iso $ISO_NAME.iso $ROOTCD
    1.35  		action 'Creating the ISO md5sum...'
    1.36 -		md5sum $ISO_NAME.iso > $ISO_NAME.md5
    1.37 +		md5sum $ISO_NAME.iso | sort -k 2 > $ISO_NAME.md5
    1.38  		status
    1.39  
    1.40  		footer "ISO image: $(du -sh $DISTRO/$ISO_NAME.iso)"