hybrid iso image + arm64 fix

linux-live/buildconfig

@@ -57,8 +57,8 @@ APT_OPTIONS2="--no-install-recommends"
 #LIVE_TYPE="casper"
 LIVE_TYPE="livekit"
 
-#BOOT_TYPE="minios"
-BOOT_TYPE="slax"
+BOOT_TYPE="hybrid"
+#BOOT_TYPE=""
 
 UNION_BUILD_TYPE="overlayfs"
 #UNION_BUILD_TYPE="aufs"

linux-live/minioslib

@@ -747,15 +747,30 @@ function build_iso() {
 
 	B="-b $LIVEKITNAME/boot/isolinux.bin -c $LIVEKITNAME/boot/isolinux.boot"
 
+	if [ $BOOT_TYPE = "hybrid" ]; then
+		C="-no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot"
+	else
 		C="-no-emul-boot -boot-load-size 4 -boot-info-table"
+	fi
 
 	# ▼ должно быть только перенаправление ошибки!
 
+	if [ -x "$(which xorriso 2>>$OUTPUT)" ] && [ $BOOT_TYPE = "hybrid" ]; then
+		M="xorriso -as mkisofs -isohybrid-mbr $DIR/$LIVEKITNAME/boot/syslinux/isohdpfx.bin"
+		D=" -isohybrid-gpt-basdat -e"
+	elif [ -x "$(which genisoimage 2>>$OUTPUT)" ]; then
 		M=genisoimage
-
+		if [ $BOOT_TYPE = "hybrid" ]; then
+			D="-efi-boot"
+		else
 			D=""
-
+		fi
+	fi
+	if [ $BOOT_TYPE = "hybrid" ]; then
+		E="EFI/boot/efiboot.img -no-emul-boot"
+	else
 		E=""
+	fi
 
 	#VER="$SYSTEMNAME $VER"
 	VER="$SYSTEMNAME"
@@ -764,12 +779,24 @@ function build_iso() {
 		rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-*.iso >>$OUTPUT 2>&1
 	fi
 
+	if [ $BOOT_TYPE = "hybrid" ]; then
+		if [ ! -d $DIR/EFI ]; then
+			cp -r $SCRIPT_DIR/linux-live/bootfiles/EFI $DIR
+		fi
+		if
+			! $M -hide-rr-moved -f -r -J -l -V "$VER" -A "$VER" \
+				$B $C $D $E -o $ISO $DIR
+		then
+			exit 1
+		fi
+	else
 		if
 			! $M -f -r -J -l -V "$VER" -A "$VER" \
 				$B $C $D $E -o $ISO $DIR
 		then
 			exit 1
 		fi
+	fi
 
 	echo ">>> $ISO created"
 
@@ -943,7 +970,15 @@ function hostreq_pkg_list() {
 		$APT_CMD install -y \
 			$(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/hostreq.list | tr "\n" " ") >>$OUTPUT 2>&1
 	else
-		$APT_CMD install -y sudo debootstrap genisoimage >>$OUTPUT 2>&1
+		$APT_CMD install -y \
+			sudo debootstrap genisoimage >>$OUTPUT 2>&1
+	fi
+	if [ $DISTRIBUTION_ARCH = "arm64" ]; then
+		$APT_CMD install -y \
+			grub-efi-arm64-bin >>$OUTPUT 2>&1
+	else
+		$APT_CMD install -y \
+			grub-efi-amd64-bin >>$OUTPUT 2>&1
 	fi
 }
 

linux-live/pkglists/hostreq.list

@@ -10,5 +10,4 @@ zstd
 xorriso
 genisoimage
 grub-pc-bin
-grub-efi-amd64-bin
 mtools