# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1656940610 0
# Node ID af1de3d45103dfe266f3c93b68c0b145cfc66a4c
# Parent  299ee29d2c036e7ac59a6cf0a51da34f6b6b05af
Fix efi files order

diff -r 299ee29d2c03 -r af1de3d45103 tazlito
--- a/tazlito	Thu Apr 07 10:03:40 2022 +0000
+++ b/tazlito	Mon Jul 04 13:16:50 2022 +0000
@@ -677,9 +677,9 @@
 $PWD/boot/isolinux/c32box.c32
 $PWD/boot/isolinux/kbd
 $PWD/$efi_img
-$(find $PWD/$efi_img $PWD/EFI/ -type f 2> /dev/null | grep -v $PWD/EFI/boot/bzImage | \
-grep -v $PWD/EFI/boot/rootfs | grep -v $PWD/EFI/boot/linux.cmdline)
-$PWD/boot/bzImage*
+$(find $PWD/EFI/ -type f 2> /dev/null | grep -v $PWD/EFI/boot/bzImage | \
+grep -v $PWD/EFI/boot/rootfs | grep -v $PWD/EFI/boot/linux.cmdline | \
+grep -v $PWD/$efi_img ; ls $PWD/boot/bzImage* )
 $PWD/EFI/boot/linux.cmdline*
 $(ls $PWD/boot/rootfs* | tac)
 EOT
@@ -1034,9 +1034,9 @@
 extract_rootfs() {
 	# Detect compression format: *.lzma.cpio, *.gzip.cpio, or *.cpio
 	# First part (lzcat or zcat) may not fail, but cpio will fail on incorrect format
-	(cd "$2"; lzcat "$1" | cpio -idm --quiet 2>/dev/null) && return
-	(cd "$2";  zcat "$1" | cpio -idm --quiet 2>/dev/null) && return
-	(cd "$2"; cpio -idm --quiet 2>/dev/null < "$1")
+	(cd "$2"; lzcat "$1" | cpio -idm --quiet ) 2>/dev/null && return
+	(cd "$2";  zcat "$1" | cpio -idm --quiet ) 2>/dev/null && return
+	(cd "$2"; cpio -idm --quiet < "$1") 2>/dev/null
 }
 
 
@@ -1332,9 +1332,9 @@
 		[ -f $i ] || continue
 		case "$i" in
 		*/rootfs*)	cmp $i ${i/\/EFI\//\/} || continue ;;
-		*/bootia32.efi)	cmp $i $1/boot/bzImage || continue
+		*/bootia32.efi)	cmp -s $i $1/boot/bzImage || continue
 				rm $1/EFI/boot/linux.cmdline ;;
-		*/bootx64.efi)	cmp $i $1/boot/bzImage64 || continue
+		*/bootx64.efi)	cmp -s $i $1/boot/bzImage64 || continue
 				rm $1/EFI/boot/linux.cmdline* ;;
 		esac
 		rm -f $i