Merge 1ec415e852 into 5f0ccd3362

Slax/debian/bootfiles/bootinst.bat

@@ -1,6 +1,6 @@
-#!/bin/sh
-exec /bin/bash "$(dirname "$0")"/bootinst.sh
-exec /bin/sh "$(dirname "$0")"/bootinst.sh
+#!/bin/sh
+exec /bin/bash "$(dirname "$0")"/bootinst.sh
+exec /bin/sh "$(dirname "$0")"/bootinst.sh
 
 @echo off
 COLOR 2F
@@ -54,14 +54,19 @@ goto setup95
 
 :setupNT
 \slax\boot\syslinux.exe -maf -d /slax/boot/ %DISK%:
-if %ERRORLEVEL% == 0 goto setupDone
+if %ERRORLEVEL% == 0 goto setupEFI
 goto errorFound
 
 :setup95
 \slax\boot\syslinux.com -maf -d /slax/boot/ %DISK%:
-if %ERRORLEVEL% == 0 goto setupDone
+if %ERRORLEVEL% == 0 goto setupEFI
 goto errorFound
 
+:setupEFI
+mkdir %DISK%:\EFI\Boot
+copy \slax\boot\EFI\Boot\* %DISK%:\EFI\Boot
+goto setupDone
+
 :setupDone
 echo Installation finished.
 goto pauseit

Slax/debian/bootfiles/bootinst.sh

@@ -148,6 +148,10 @@ if [ "$DEV" != "$PART" ]; then
    ) | fdisk $DEV >/dev/null 2>&1
 fi
 
+# UEFI boot loader
+mkdir -p "$BOOT/../../EFI"
+mv "EFI/Boot" "$BOOT/../../EFI/"
+
 echo "Boot installation finished."
 echo "Press Enter..."
 read junk

bootfiles/bootinst.bat

@@ -11,7 +11,7 @@ set BOOTFLAG=boot666s.tmp
 echo This file is used to determine current drive letter. It should be deleted. >\%BOOTFLAG%
 if not exist \%BOOTFLAG% goto readOnly
 
-echo wait please ...
+echo wait please ...
 for %%d in ( C D E F G H I J K L M N O P Q R S T U V W X Y Z ) do if exist %%d:\%BOOTFLAG% set DISK=%%d
 del \%BOOTFLAG%
 if %DISK% == none goto DiskNotFound
@@ -24,10 +24,16 @@ goto setup95
 
 :setupNT
 \boot\syslinux.exe -maf -d /boot/ %DISK%:
-goto setupDone
+goto setupEFI
 
 :setup95
 \boot\syslinux.com -maf -d /boot/ %DISK%:
+goto setupEFI
+
+:setupEFI
+mkdir %DISK%:\EFI\Boot
+copy \boot\EFI\Boot\* %DISK%:\EFI\Boot
+goto setupDone
 
 :setupDone
 echo Installation finished.

bootfiles/bootinst.sh

@@ -40,5 +40,9 @@ if [ "$DEV" != "$PART" ]; then
    ) | fdisk $DEV >/dev/null 2>&1
 fi
 
+# UEFI boot loader
+mkdir -p "$BOOT/../../EFI"
+mv "EFI/Boot" "$BOOT/../../EFI/"
+
 echo "Boot installation finished."
 cd "$CWD"

build

@@ -49,11 +49,15 @@ if [ "$INITRAMFS" != "" ]; then
    mv "$INITRAMFS" $BOOT/initrfs.img
 fi
 
-cp bootfiles/* $BOOT
+cp -r bootfiles/* $BOOT
 cat bootfiles/syslinux.cfg | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" > $BOOT/syslinux.cfg
 cat bootfiles/bootinst.bat | sed -r "s:/boot/:/$LIVEKITNAME/boot/:" | sed -r "s:\\\\boot\\\\:\\\\$LIVEKITNAME\\\\boot\\\\:" > $BOOT/bootinst.bat
 cp $VMLINUZ $BOOT/ || exit
 
+# UEFI booting
+mv $BOOT/EFI/Boot/syslinux.efi $BOOT/EFI/Boot/bootx64.efi
+cat $BOOT/syslinux.cfg | sed -r "s:/$LIVEKITNAME/boot/vesa::" > $BOOT/EFI/Boot/syslinux.cfg
+
 # create compressed 01-core.sb
 COREFS=""
 for i in $MKMOD; do