diff options
Diffstat (limited to 'EFI')
| -rw-r--r-- | EFI/BOOT/grub-embedded.cfg | 3 | ||||
| -rw-r--r-- | EFI/BOOT/grub.cfg | 1 | ||||
| -rw-r--r-- | EFI/BOOT/help.txt | 4 | ||||
| -rw-r--r-- | EFI/BOOT/make-grub.sh | 5 |
4 files changed, 11 insertions, 2 deletions
diff --git a/EFI/BOOT/grub-embedded.cfg b/EFI/BOOT/grub-embedded.cfg index 917672f..cc2098e 100644 --- a/EFI/BOOT/grub-embedded.cfg +++ b/EFI/BOOT/grub-embedded.cfg @@ -1 +1,4 @@ search --file --no-floppy --set=root /EFI/BOOT/SLACKWARELIVE +if [ -e ($root)/EFI/BOOT/grub.cfg ]; then + set prefix=($root)/EFI/BOOT +fi diff --git a/EFI/BOOT/grub.cfg b/EFI/BOOT/grub.cfg deleted file mode 100644 index 63e7c80..0000000 --- a/EFI/BOOT/grub.cfg +++ /dev/null @@ -1 +0,0 @@ -source $prefix/menu/grub.cfg diff --git a/EFI/BOOT/help.txt b/EFI/BOOT/help.txt index 8d7310e..ea24562 100644 --- a/EFI/BOOT/help.txt +++ b/EFI/BOOT/help.txt @@ -125,6 +125,10 @@ toram => copy the OS from the media to to RAM before running it. toram=all => Prevent writes to disk since we are supposed to run from RAM; equivalent to parameter "toram". +toram=core => Load Console OS modules into RAM. Console-only Slackware + loads fast, contains 'setup2hd' and frees up your USB drive so you can + overwrite it with a Persistent Live OS. + toram=os => Load OS modules into RAM, but write persistent data to USB. === Troubleshooting === diff --git a/EFI/BOOT/make-grub.sh b/EFI/BOOT/make-grub.sh index a4f1f50..ddf9f68 100644 --- a/EFI/BOOT/make-grub.sh +++ b/EFI/BOOT/make-grub.sh @@ -37,6 +37,9 @@ EFIFORM=${EFIFORM:-"x86_64"} EFISUFF=${EFISUFF:-"x64"} EFIDIR=${EFIDIR:-"/EFI/BOOT"} +# Fix the path in grub-ebedded.cfg if needed: +sed -e "s,/EFI/BOOT,${EFIDIR}," -i grub-embedded.cfg + echo echo "Building ${EFIDIR}/boot${EFISUFF}.efi and /boot/syslinux/efiboot.img." @@ -45,7 +48,7 @@ echo "Building ${EFIDIR}/boot${EFISUFF}.efi and /boot/syslinux/efiboot.img." GMODDIR="$(dirname $(LANG=C grub-mkimage -O ${EFIFORM}-efi -p ${EFIDIR} alienbob 2>&1 | cut -d\` -f2 |cut -d\' -f1) )" GMODLIST="" # 'shim_lock' is built into grub, not a module anymore: -for GMOD in part_gpt part_msdos fat ext2 f2fs iso9660 ntfs chain linux boot configfile normal regexp extcmd minicmd reboot halt search search_fs_file search_fs_uuid search_label gfxterm gfxmenu gfxterm_menu gfxterm_background efi_gop efi_uga all_video loadbios gzio echo true probe loadenv bitmap_scale font cat help ls png jpeg tga test at_keyboard usb_keyboard disk memdisk nativedisk file loopback tar tftp net efinet efifwsetup zstd ; do +for GMOD in part_gpt part_msdos fat btrfs ext2 f2fs jfs xfs iso9660 ntfs chain linux boot configfile normal regexp extcmd minicmd reboot halt search search_fs_file search_fs_uuid search_label gfxterm gfxmenu gfxterm_menu gfxterm_background efi_gop efi_uga all_video loadbios gzio echo true probe loadenv bitmap_scale font cat help ls png jpeg tga test at_keyboard usb_keyboard disk memdisk nativedisk file loopback tar tftp net efinet efifwsetup zstd ; do [ -f ${GMODDIR}/${GMOD}.mod ] && GMODLIST="${GMODLIST} ${GMOD}" || echo ">> ${GMOD} not found" done |