--- builds_bin/build_ISO	2020/06/14 05:54:37	1.43
+++ builds_bin/build_ISO	2020/06/15 04:27:12	1.44
@@ -25,15 +25,18 @@ do
     then
         echo "building efiboot.img"
         # the content of the img should be /EFI/BOOT* and not /BOOT/*, so we need to copy the content in a temp dir 
-        sudo rm -rf /tmp/efiboot
-        mkdir -p /tmp/efiboot
-        cp -a $(pwd)/$distarch/$img /tmp/efiboot
-        /sbin/mksquashfs \
-            /tmp/efiboot \
-            $(pwd)/$distarch/images/efiboot.img \
-            -all-root -no-fragments -noappend
-        sudo chmod 664 $(pwd)/$distarch/images/efiboot.img
-        sudo rm -rf /tmp/efiboot
+        sudo mount -o loop  $(pwd)/$distarch/efiboot.img /tmp/loop
+        sudo cp -a $(pwd)/$distarch/EFI/BOOT/grub.cfg /tmp/loop/EFI/BOOT/
+        sudo umount /tmp/loop
+#        sudo rm -rf /tmp/efiboot
+#        mkdir -p /tmp/efiboot
+#        cp -a $(pwd)/$distarch/$img /tmp/efiboot
+#        /sbin/mksquashfs \
+#            /tmp/efiboot \
+#            $(pwd)/$distarch/images/efiboot.img \
+#            -all-root -no-fragments -noappend
+#        sudo chmod 664 $(pwd)/$distarch/images/efiboot.img
+#        sudo rm -rf /tmp/efiboot
     elif [ -d "$(pwd)/$distarch/$img" ]
     then
 	echo "building $img.img...."
@@ -68,13 +71,6 @@ today="$(date '+%d %b %Y')"
 if [ "$distrel" == "10" ]
 then
 #Caton
-#xorriso -as mkisofs -isohybrid-mbr isolinux/isohdpfx.bin \
-#-c isolinux/boot.cat -b isolinux/isolinux.bin 
-#-no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot \
-#-e images/efiboot.img -no-emul-boot \
-#-isohybrid-gpt-basdat \
-#-o ../custom-SME10.iso .
-# in fact it is :
 #xorriso -as mkisofs \
 #-o ../custom-SME10.iso \
 #-V "SME Server" \
@@ -91,8 +87,8 @@ then
 #-isohybrid-gpt-basdat \
 #-R -J -v -T .
 
-/usr/bin/xorriso -as mkisofs -isohybrid-mbr  /usr/share/syslinux/isohdpfx.bin \
-    $mkisopts -joliet-long \
+/usr/bin/xorriso -as mkisofs  -isohybrid-mbr  /usr/share/syslinux/isohdpfx.bin \
+    $mkisopts  -joliet-long \
     -V "$distname" \
     -A "$distname" \
     -volset "$distname" \
@@ -141,18 +137,22 @@ then
 
         echo "building efiboot.img for netinstall"
         # the content of the img should be /EFI/BOOT* and not /BOOT/*, so we need to copy the content in a temp dir 
-        sudo rm -rf /tmp/remaster/efiboot
-        mkdir -p /tmp/remaster/efiboot
-        cp -a /tmp/remaster/EFI $(pwd)/$distarch/efiboot
-        /sbin/mksquashfs \
-            /tmp/remaster/efiboot \
-            /tmp/remaster/images/efiboot.img \
-            -all-root -no-fragments -noappend
+#        sudo rm -rf /tmp/remaster/efiboot
+	sudo mount -o loop  /tmp/remaster/efiboot.img /tmp/loop
+	sudo cp -a /tmp/remaster/EFI/BOOT/grub.cfg /tmp/loop/EFI/BOOT/
+	sudo umount /tmp/loop
+#        mkdir -p /tmp/remaster/efiboot
+#        cp -a /tmp/remaster/EFI $(pwd)/$distarch/efiboot
+#        /sbin/mksquashfs \
+#            /tmp/remaster/efiboot \
+#            /tmp/remaster/images/efiboot.img \
+#            -all-root -no-fragments -noappend
         sudo chmod 664 /tmp/remaster/images/efiboot.img
-        sudo rm -rf /tmp/remaster/efiboot
+#        sudo rm -rf /tmp/remaster/efiboot
 	#rebuild iso for netinstall
 
-	/usr/bin/xorriso -as mkisofs -isohybrid-mbr  /usr/share/syslinux/isohdpfx.bin \
+#	/usr/bin/xorriso -as mkisofs -isohybrid-mbr  /usr/share/syslinux/isohdpfx.bin \
+       /usr/bin/xorriso -as mkisofs \
     	$mkisopts -joliet-long \
     	-V "$distname" \
     	-A "$distname" \