# HG changeset patch # User Pascal Bellard # Date 1519629041 -3600 # Node ID 66335bf0d909ccf2c5ed5b8345d328357042bc64 # Parent aa7849739d84b33bfb3af6a2697dd7dfb2b547a8 Russian inner dolls should not overwrite /cdrom/boot diff -r aa7849739d84 -r 66335bf0d909 tazlito --- a/tazlito Sun Feb 25 17:55:06 2018 +0100 +++ b/tazlito Mon Feb 26 08:10:41 2018 +0100 @@ -530,7 +530,8 @@ action 'Computing md5...' touch boot/isolinux/boot.cat - find * -type f ! -name md5sum ! -name 'vmlinuz-*' -exec md5sum {} \; > md5sum + find * -type f ! -name md5sum ! -name 'vmlinuz-*' -exec md5sum {} \; | \ + sort -k 2 > md5sum status cd - >/dev/null @@ -601,7 +602,7 @@ create_iso $ISO_NAME.iso $ROOTCD action 'Creating the ISO md5sum...' - md5sum $ISO_NAME.iso > $ISO_NAME.md5 + md5sum $ISO_NAME.iso | sort -k 2 > $ISO_NAME.md5 status separator @@ -2706,7 +2707,8 @@ install_list_to_rootfs "$DISTRO/list-packages0$n" "${ROOTFS}0$n" - cp -a ${ROOTFS}0$n/boot $ROOTCD + action 'Updating the boot directory...' + yes n | cp -ai ${ROOTFS}0$n/boot $ROOTCD rm -rf ${ROOTFS}0$n/boot cd $DISTRO @@ -2942,7 +2944,7 @@ cd $DISTRO create_iso $ISO_NAME.iso $ROOTCD action 'Creating the ISO md5sum...' - md5sum $ISO_NAME.iso > $ISO_NAME.md5 + md5sum $ISO_NAME.iso | sort -k 2 > $ISO_NAME.md5 status footer "ISO image: $(du -sh $DISTRO/$ISO_NAME.iso)"