# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1527674891 -7200
# Node ID 674d4b42127b7ec7d70702c36cf9aadc20f126ea
# Parent  6d164da691458cb254b686264e54063d106d7ad3
fix cleanup_efi_boot

diff -r 6d164da69145 -r 674d4b42127b tazlito
--- a/tazlito	Thu May 24 10:44:24 2018 +0200
+++ b/tazlito	Wed May 30 12:08:11 2018 +0200
@@ -485,24 +485,20 @@
 				stat -c "%s %n" "$i"
 			done 2> /dev/null
 			efilinux="/EFI/BOOT/$(basename $1).efi"
-			eficmdline="$efilinux rw root=0x100 autologin\
+			sed 's|/|\\|g' >> $basedir/efi/boot/startup.nsh <<EOT
+# start tazlito $efilinux
+set -v num 0
+for %i run (1 20)
+  if exist FS%num%:$efilinux then
+    FS%num%:
+    $efilinux rw root=0x100 autologin\
 $( ( cd $basedir/efi/boot ; ls -r rootfs*gz ) | while read f ; do \
 [ "$efifile" == "bootx64.efi" -a -s $basedir/efi/boot/${f}64 ] && \
-f=${f}64; echo -n " initrd=/EFI/BOOT/$f";done)"
-			sed 's|/|\\|g' >> $basedir/efi/boot/startup.nsh <<EOT
-# start $efilinux
-for %i run (1 10)
+f=${f}64; echo -n " initrd=/EFI/BOOT/$f";done)
+  endif
   set -v num %i
-  if exist FS%num%:$efilinux then
-    FS%num%:
-    $eficmdline
-  endif
 endfor
-if exist FS0:$efilinux then
-  FS0:
-  $eficmdline
-endif
-# stop $efilinux
+# stop tazlito $efilinux
 EOT
 		fi
 		shift
@@ -1279,10 +1275,11 @@
 cleanup_efi_boot() {
 	for i in $1/efi/boot/* ; do
 		[ -f $i ] || continue
-		cmp $i ${i/\/efi\//\/} 2> /dev/null || continue
+		b=${i/\/efi\//\/}
+		cmp $i ${b%.efi} || continue
 		rm -f $i
 		case "$i" in
-		*vmlinuz*) sed -i '/# start /,/# stop /d' \
+		*vmlinuz*) sed -i '/# start tazlito /,/# stop tazlito /d' \
 				$(dirname $i)/startup.nsh
 		esac
 		if [ ! -s $(dirname $i)/startup.nsh ]; then