# HG changeset patch # User Pascal Bellard # Date 1528024102 -7200 # Node ID 8b6be2b2d776087a2d699322debf5ab0a7ef382f # Parent 035c08dd4580ca831f23312ee2bda65daa40afce Fix cleanup_efi_boot diff -r 035c08dd4580 -r 8b6be2b2d776 tazlito --- a/tazlito Sat Jun 02 15:45:33 2018 +0200 +++ b/tazlito Sun Jun 03 13:08:22 2018 +0200 @@ -1264,12 +1264,14 @@ cleanup_efi_boot() { for i in $1/efi/boot/* ; do [ -f $i ] || continue - b=${i/\/efi\//\/} - cmp $i ${b%.efi} || continue + case "$i" in + */rootfs*) cmp $i ${i/\/efi\//\/} || continue ;; + */bootia32.efi) cmp $i $1/boot/bzImage || continue + rm $1/efi/boot/linux.cmdline ;; + */bootx64.efi) cmp $i $1/boot/bzImage64 || continue + rm $1/efi/boot/linux.cmdline* ;; + esac rm -f $i - case "$i" in - *vmlinuz*) rm -f $(dirname $i)/linux.cmdline ;; - esac rmdir $1/efi/boot && rmdir $1/efi done 2> /dev/null }