sync with archiso v70v70

5c36c85 (tag: v70) Add changelog for 70
29f4b00 Add changelog entry for terminal_output fix
8535d69 Use console as grub's terminal_output
cedb3d1 configs/*/grub/grub.cfg: replace /dev/disk/by-uuid/ with UUID=
1da743c README.transfer.rst: update instructions
04d439d Rename docs/README.transfer to docs/README.transfer.rst
a094153 Move SYSLINUX directory from /syslinux/ to /boot/syslinux/
c8474f8 Move the .uuid file to /boot/grub/YYYY-mm-dd-HH-MM-SS-00.uuid
d96a356 mkarchiso: write grubenv in _make_common_bootmode_grub_cfg
f750200 configs/*/grub/grub.cfg: reuse ARCHISO_HINT and ARCHISO_UUID passed from the embedded grub.cfg
b94d7c4 Move grub files from /EFI/BOOT/ to /boot/grub/ on ISO 9660
f5ade89 Do not duplicate grub.cfg in efiboot.img
40e0976 mkarchiso: add more details to the comment in grub-embed.cfg
7c6f266 configs/*/profiledef.sh: honor SOURCE_DATE_EPOCH
28d2bc1 mkarchiso: do not place memtest86+ in netboot artifacts
0f34e44 configs/*/airootfs/etc/ssh/sshd_config: update to match 9.2p1-1
5587e03 Preload GRUB's NTFS, exFAT and UDF modules
3f95d39 configs/*/grub/grub.cfg: search for a .uuid file in /.disk/ and use the volume it's on
8d7ad3c mkarchiso: write a .uuid file to /.disk/ on ISO 9660 to allow GRUB to search for it
ab3d788 Update URLs

Signed-off-by: David P. <megver83@parabola.nu>

5 files changed, 25 insertions, 18 deletions

diff --git a/configs/releng/airootfs/etc/ssh/sshd_config b/configs/releng/airootfs/etc/ssh/sshd_config
index 93f7d63..dc22c11 100644
--- a/configs/releng/airootfs/etc/ssh/sshd_config
+++ b/configs/releng/airootfs/etc/ssh/sshd_config
@@ -58,7 +58,7 @@ AuthorizedKeysFile	.ssh/authorized_keys
 #PermitEmptyPasswords no
 
 # Change to no to disable s/key passwords
-#KbdInteractiveAuthentication yes
+KbdInteractiveAuthentication no
 
 # Kerberos options
 #KerberosAuthentication no
@@ -75,7 +75,7 @@ AuthorizedKeysFile	.ssh/authorized_keys
 # be allowed through the KbdInteractiveAuthentication and
 # PasswordAuthentication.  Depending on your PAM configuration,
 # PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin without-password".
+# the setting of "PermitRootLogin prohibit-password".
 # If you just want the PAM account and session checks to run without
 # PAM authentication, then enable this but set PasswordAuthentication
 # and KbdInteractiveAuthentication to 'no'.
@@ -88,7 +88,7 @@ UsePAM yes
 #X11DisplayOffset 10
 #X11UseLocalhost yes
 #PermitTTY yes
-PrintMotd no # pam does that
+PrintMotd no
 #PrintLastLog yes
 #TCPKeepAlive yes
 #PermitUserEnvironment no
diff --git a/configs/releng/grub/grub.cfg b/configs/releng/grub/grub.cfg
index 44942f1..a72ca7a 100644
--- a/configs/releng/grub/grub.cfg
+++ b/configs/releng/grub/grub.cfg
@@ -3,15 +3,18 @@ insmod part_gpt
 insmod part_msdos
 insmod fat
 insmod iso9660
+insmod ntfs
+insmod ntfscomp
+insmod exfat
+insmod udf
 
 # Use graphics-mode output
 insmod all_video
 insmod font
 if loadfont "${prefix}/fonts/unicode.pf2" ; then
-    insmod gfxterm
     set gfxmode="auto"
     terminal_input console
-    terminal_output gfxterm
+    terminal_output console
 fi
 
 # Enable serial console
@@ -20,6 +23,15 @@ if serial --unit=0 --speed=115200; then
     terminal_output --append serial
 fi
 
+# Search for the ISO volume
+if [ -z "${PARABOLAISO_UUID}" ]; then
+    if [ -z "${PARABOLAISO_HINT}" ]; then
+        regexp --set=1:PARABOLAISO_HINT '^\(([^)]+)\)' "${cmdpath}"
+    fi
+    search --no-floppy --set=root --file '%PARABOLAISO_SEARCH_FILENAME%' --hint "${PARABOLAISO_HINT}"
+    probe --set PARABOLAISO_UUID --fs-uuid "${root}"
+fi
+
 # Set default menu entry
 default=parabola
 timeout=15
@@ -32,15 +44,13 @@ play 600 988 1 1319 4
 
 menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'parabola' {
     set gfxpayload=keep
-    search --no-floppy --set=root --label %PARABOLAISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisodevice=UUID=${PARABOLAISO_UUID}
     initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
 }
 
 menuentry "Parabola GNU/Linux-libre install medium with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'parabola-accessibility' {
     set gfxpayload=keep
-    search --no-floppy --set=root --label %PARABOLAISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisodevice=UUID=${PARABOLAISO_UUID} accessibility=on
     initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
 }
 
@@ -48,18 +58,15 @@ if [ "${grub_platform}" == "efi" ]; then
     if [ "${grub_cpu}" == "x86_64" ]; then
         menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool {
             set gfxpayload=800x600,1024x768
-            search --fs-uuid --no-floppy --set=root --label %PARABOLAISO_LABEL%
-            linux /%INSTALL_DIR%/boot/memtest.efi
+            linux /boot/memtest86+/memtest.efi
         }
         menuentry "UEFI Shell" {
             insmod chain
-            search --no-floppy --set=root --label %PARABOLAISO_LABEL%
             chainloader /shellx64.efi
         }
     elif [ "${grub_cpu}" == "i386" ]; then
         menuentry "UEFI Shell" {
             insmod chain
-            search --no-floppy --set=root --label %PARABOLAISO_LABEL%
             chainloader /shellia32.efi
         }
     fi
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
index 12df102..29cd03d 100644
--- a/configs/releng/profiledef.sh
+++ b/configs/releng/profiledef.sh
@@ -2,10 +2,10 @@
 # shellcheck disable=SC2034
 
 iso_name="parabola"
-iso_label="PARA_$(date +%Y%m)"
+iso_label="PARA_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)"
 iso_publisher="Parabola GNU/Linux-libre <https://parabola.nu>"
 iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
-iso_version="$(date +%Y.%m.%d)"
+iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
 install_dir="parabola"
 buildmodes=('iso')
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
diff --git a/configs/releng/syslinux/parabolaiso_head.cfg b/configs/releng/syslinux/parabolaiso_head.cfg
index 591097e..4f56858 100644
--- a/configs/releng/syslinux/parabolaiso_head.cfg
+++ b/configs/releng/syslinux/parabolaiso_head.cfg
@@ -12,7 +12,7 @@ MENU CMDLINEROW 14
 MENU HELPMSGROW 16
 MENU HELPMSGENDROW 29
 
-# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
+# Refer to https://wiki.syslinux.org/wiki/index.php/Comboot/menu.c32
 
 MENU COLOR border       35;40   #ff777caa #a0000000 std
 MENU COLOR title        1;35;40 #ff777caa #a0000000 std
diff --git a/configs/releng/syslinux/parabolaiso_tail.cfg b/configs/releng/syslinux/parabolaiso_tail.cfg
index e5339a2..dcbb413 100644
--- a/configs/releng/syslinux/parabolaiso_tail.cfg
+++ b/configs/releng/syslinux/parabolaiso_tail.cfg
@@ -7,12 +7,12 @@ MENU LABEL Boot existing OS
 COM32 chain.c32
 APPEND hd0 0
 
-# http://www.memtest.org/
+# https://www.memtest.org/
 LABEL memtest
 MENU LABEL Run Memtest86+ (RAM test)
 LINUX /%INSTALL_DIR%/boot/memtest
 
-# http://hdt-project.org/
+# https://wiki.syslinux.org/wiki/index.php/Hdt_(Hardware_Detection_Tool)
 LABEL hdt
 MENU LABEL Hardware Information (HDT)
 COM32 hdt.c32