SliTaz Repositories

     1.1 --- a/tazlito	Thu Apr 07 10:03:40 2022 +0000
     1.2 +++ b/tazlito	Mon Jul 04 13:16:50 2022 +0000
     1.3 @@ -677,9 +677,9 @@
     1.4  $PWD/boot/isolinux/c32box.c32
     1.5  $PWD/boot/isolinux/kbd
     1.6  $PWD/$efi_img
     1.7 -$(find $PWD/$efi_img $PWD/EFI/ -type f 2> /dev/null | grep -v $PWD/EFI/boot/bzImage | \
     1.8 -grep -v $PWD/EFI/boot/rootfs | grep -v $PWD/EFI/boot/linux.cmdline)
     1.9 -$PWD/boot/bzImage*
    1.10 +$(find $PWD/EFI/ -type f 2> /dev/null | grep -v $PWD/EFI/boot/bzImage | \
    1.11 +grep -v $PWD/EFI/boot/rootfs | grep -v $PWD/EFI/boot/linux.cmdline | \
    1.12 +grep -v $PWD/$efi_img ; ls $PWD/boot/bzImage* )
    1.13  $PWD/EFI/boot/linux.cmdline*
    1.14  $(ls $PWD/boot/rootfs* | tac)
    1.15  EOT
    1.16 @@ -1034,9 +1034,9 @@
    1.17  extract_rootfs() {
    1.18  	# Detect compression format: *.lzma.cpio, *.gzip.cpio, or *.cpio
    1.19  	# First part (lzcat or zcat) may not fail, but cpio will fail on incorrect format
    1.20 -	(cd "$2"; lzcat "$1" | cpio -idm --quiet 2>/dev/null) && return
    1.21 -	(cd "$2";  zcat "$1" | cpio -idm --quiet 2>/dev/null) && return
    1.22 -	(cd "$2"; cpio -idm --quiet 2>/dev/null < "$1")
    1.23 +	(cd "$2"; lzcat "$1" | cpio -idm --quiet ) 2>/dev/null && return
    1.24 +	(cd "$2";  zcat "$1" | cpio -idm --quiet ) 2>/dev/null && return
    1.25 +	(cd "$2"; cpio -idm --quiet < "$1") 2>/dev/null
    1.26  }
    1.27  
    1.28  
    1.29 @@ -1332,9 +1332,9 @@
    1.30  		[ -f $i ] || continue
    1.31  		case "$i" in
    1.32  		*/rootfs*)	cmp $i ${i/\/EFI\//\/} || continue ;;
    1.33 -		*/bootia32.efi)	cmp $i $1/boot/bzImage || continue
    1.34 +		*/bootia32.efi)	cmp -s $i $1/boot/bzImage || continue
    1.35  				rm $1/EFI/boot/linux.cmdline ;;
    1.36 -		*/bootx64.efi)	cmp $i $1/boot/bzImage64 || continue
    1.37 +		*/bootx64.efi)	cmp -s $i $1/boot/bzImage64 || continue
    1.38  				rm $1/EFI/boot/linux.cmdline* ;;
    1.39  		esac
    1.40  		rm -f $i