4 files changed, 42 insertions, 6 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 dbfb5b2..ea24562 100644
--- a/EFI/BOOT/help.txt
+++ b/EFI/BOOT/help.txt
@@ -10,11 +10,15 @@ To boot with default values just press ENTER.
 kbd=fr xkb=ch,fr => Example of custom X keyboard layout.
  
 livepw="somestring" => Change the password for user "live".
+  The password is passed as a cleartext string.
+  You can pass an empty string (livepw=) to remove the password.
 
 locale=nl_NL kbd=nl tz=Europe/Amsterdam => Example of language, 
   keyboard and/or timezone customization. 
  
 rootpw="somestring" => Change the password for user "root".
+  The password is passed as a cleartext string.
+  You can pass an empty string (rootpw=) to remove the password.
 
 === Custom software ===
 
@@ -52,8 +56,10 @@ localhd => initialize RAID/LVM on local hard drives.
 
 tweaks=tweak1[,tweak2,[,...]] => Implemented tweaks:
   nga - no glamor 2D acceleration, avoids error "EGL_MESA_drm_image required".
+  nsh - no sub-pixel hinting in freetype.
   tpb - enable TrackPoint scrolling while holding down middle mouse button.
   syn - start the syndaemon for better support of Synaptics touchpads.
+  ssh - start SSH daemon (disabled by default).
 
 nomodeset => Boot without kernel mode setting, needed with 
   some machines. 
@@ -71,6 +77,9 @@ cfg=[skip|write] =>
   OS parameters; or specify 'write' to write current OS parameters
   to disk.
 
+domain=your_custom_domain =>
+  Specify a custom domain name.  Defaults to 'example.net'.
+
 hostname=your_custom_hostname[,qualifier] =>
   Specify a custom hostname.  A qualifier 'fixed' can be appended
   to prohibit hostname modification in  case of network boot.
@@ -80,7 +89,8 @@ livemedia=/dev/sdX => Tell the init script which partition
   become necessary if you have another copy of Slackware Live
   installed in another partition.
 
-livemedia=/dev/sdX:/path/to/live.iso => Use this if you want to
+livemedia=/dev/sdX:/path/to/live.iso
+livemedia=scandev:/path/to/live.iso => Use this if you want to
   load the live OS from an ISO file on a local harddisk partition.
 
 livemain=directoryname => Use this if you copied the content
@@ -91,16 +101,36 @@ luksvol=file1[:/mountpoint1][,file1[:/mountpoint2],...] =>
   Multiple files should be separated with comma.
   Specify "luksvol=" to *prevent* mounting any LUKS container.
 
-nop => No persistence, i.e. boot the virgin installation in 
-  case your "persistence" directory got corrupted. 
+nop => No persistence, i.e. boot the virgin installation in
+  case your "persistence" directory got corrupted.
+  If you want to ignore any persistent data during boot,
+  including LUKS data, specify "nop luksvol=" .
+
+nop=wipe => Wipe all data from persistence directory or container.
+  Useful in cases where your persistent data got corrupted.
  
 persistence=directoryname => Use this if you want to use
   a different directory than "persistence" for storing
   persistent data.
 
+persistence=/dev/sdX:/path/to/mypersistence
+persistence=scandev:/path/to/mypersistence => Use this if
+  the persistence directory or container is not located on the USB stick,
+  but on a local hard disk partition. Useful for network (PXE) boot
+  where you still want to offer users persistence.
+
 toram => copy the OS from the media to to RAM before running it.
   You can remove the boot media after booting.
 
+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 ===
 
 blacklist=mod1[,mod2[...]]  => Add one or more kernel modules
diff --git a/EFI/BOOT/make-grub.sh b/EFI/BOOT/make-grub.sh
index 6575ea7..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."
 
@@ -44,12 +47,13 @@ echo "Building ${EFIDIR}/boot${EFISUFF}.efi and /boot/syslinux/efiboot.img."
 # works with mutiple grub releases (grub-2.02 added the 'disk' module):
 GMODDIR="$(dirname $(LANG=C grub-mkimage -O ${EFIFORM}-efi -p ${EFIDIR} alienbob 2>&1 | cut -d\` -f2 |cut -d\' -f1) )"
 GMODLIST=""
-for GMOD in part_gpt part_msdos fat ext2 iso9660 ntfs chain linux boot configfile normal regexp extcmd minicmd reboot halt search search_fs_file search_fs_uuid search_label gfxterm gfxmenu 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 ; do
+# 'shim_lock' is built into grub, not a module anymore:
+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
 
 # Build bootx64.efi/bootia32.efi, which will be installed here in ${EFIDIR}.
-grub-mkimage --format=${EFIFORM}-efi --output=boot${EFISUFF}.efi --config=grub-embedded.cfg --compression=xz --prefix=${EFIDIR} ${GMODLIST}
+grub-mkimage --format=${EFIFORM}-efi --output=boot${EFISUFF}.efi --config=grub-embedded.cfg --sbat=grub_sbat.csv --compression=xz --prefix=${EFIDIR} ${GMODLIST}
 
 # Then, create a FAT formatted image that contains bootx64.efi in the
 # ${EFIDIR} directory.  This is used to bootstrap GRUB from the ISO image.