Briq
/
linux-live
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 1ec415e852 into 5f0ccd3362

pull/84/merge
Rob Emery 2019-10-13 22:37:44 +00:00 committed by GitHub
parent 5f0ccd3362 1ec415e852
commit de512ba3c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Slax/debian/bootfiles/bootinst.bat
View File

@ -54,14 +54,19 @@ goto setup95
:setupNT :setupNT
\slax\boot\syslinux.exe -maf -d /slax/boot/ %DISK%: \slax\boot\syslinux.exe -maf -d /slax/boot/ %DISK%:
if %ERRORLEVEL% == 0 goto setupDone if %ERRORLEVEL% == 0 goto setupEFI
goto errorFound goto errorFound
:setup95 :setup95
\slax\boot\syslinux.com -maf -d /slax/boot/ %DISK%: \slax\boot\syslinux.com -maf -d /slax/boot/ %DISK%:
if %ERRORLEVEL% == 0 goto setupDone if %ERRORLEVEL% == 0 goto setupEFI
goto errorFound goto errorFound
:setupEFI
mkdir %DISK%:\EFI\Boot
copy \slax\boot\EFI\Boot\* %DISK%:\EFI\Boot
goto setupDone
:setupDone :setupDone
echo Installation finished. echo Installation finished.
goto pauseit goto pauseit

4
Slax/debian/bootfiles/bootinst.sh
View File

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

BIN
bootfiles/EFI/Boot/ldlinux.e64 100644
View File

Binary file not shown.

BIN
bootfiles/EFI/Boot/libutil.c32 100644
View File

Binary file not shown.

BIN
bootfiles/EFI/Boot/menu.c32 100644
View File

Binary file not shown.

BIN
bootfiles/EFI/Boot/syslinux.efi 100755
View File

Binary file not shown.

8
bootfiles/bootinst.bat
View File

@ -24,10 +24,16 @@ goto setup95
:setupNT :setupNT
\boot\syslinux.exe -maf -d /boot/ %DISK%: \boot\syslinux.exe -maf -d /boot/ %DISK%:
goto setupDone goto setupEFI
:setup95 :setup95
\boot\syslinux.com -maf -d /boot/ %DISK%: \boot\syslinux.com -maf -d /boot/ %DISK%:
goto setupEFI
:setupEFI
mkdir %DISK%:\EFI\Boot
copy \boot\EFI\Boot\* %DISK%:\EFI\Boot
goto setupDone
:setupDone :setupDone
echo Installation finished. echo Installation finished.

4
bootfiles/bootinst.sh
View File

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

6
build
View File

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