lxde-openrc: sync with releng-openrc

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

10 files changed, 26 insertions, 17 deletions

diff --git a/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector b/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
index 76e84dd..850d048 100755
--- a/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
+++ b/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
@@ -3,6 +3,8 @@
 if [ "$2" == up ] && ! grep -qoP 'mirror=\K\S+' /proc/cmdline; then
   reflector \
     --save /etc/pacman.d/mirrorlist \
+    --ipv4 \
+    --ipv6 \
     --protocol https \
     --latest 20 \
     --sort rate
diff --git a/lxde-openrc/airootfs/etc/motd b/lxde-openrc/airootfs/etc/motd
index e3d2947..6801b24 100644
--- a/lxde-openrc/airootfs/etc/motd
+++ b/lxde-openrc/airootfs/etc/motd
@@ -2,8 +2,10 @@ To install Parabola GNU/Linux-libre follow the installation guide:
 https://wiki.parabola.nu/Installation_Guide
 
 For Wi-Fi, authenticate to the wireless network using the nmtui-connect utility.
-Ethernet and Wi-Fi connections using NetworkManager should work automatically.
+For mobile broadband (WWAN) modems, connect with the mmcli utility.
+Ethernet, WLAN and WWAN interfaces using DHCP should work automatically.
 
 After connecting to the internet, the installation guide can be accessed
 via the convenience script Installation_guide.
 
+                                          
diff --git a/lxde-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf b/lxde-openrc/efiboot/entries/01-parabolaiso-x86_64-linux-libre.conf
index 7fec6be..7fec6be 100644
--- a/lxde-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf
+++ b/lxde-openrc/efiboot/entries/01-parabolaiso-x86_64-linux-libre.conf
diff --git a/lxde-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf b/lxde-openrc/efiboot/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
index e6e8ab6..e6e8ab6 100644
--- a/lxde-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
+++ b/lxde-openrc/efiboot/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
diff --git a/lxde-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/lxde-openrc/efiboot/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
index 0c635af..0c635af 100644
--- a/lxde-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
+++ b/lxde-openrc/efiboot/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
diff --git a/lxde-openrc/efiboot/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf b/lxde-openrc/efiboot/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf
new file mode 100644
index 0000000..f8b4ae3
--- /dev/null
+++ b/lxde-openrc/efiboot/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf
@@ -0,0 +1,5 @@
+menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM) with speech" {
+    loader   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+    initrd   /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+    options  "parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram accessibility=on"
+}
diff --git a/lxde-openrc/efiboot/EFI/BOOT/refind.conf b/lxde-openrc/efiboot/refind.conf
index 599ee49..599ee49 100644
--- a/lxde-openrc/efiboot/EFI/BOOT/refind.conf
+++ b/lxde-openrc/efiboot/refind.conf
diff --git a/lxde-openrc/packages.both b/lxde-openrc/packages.both
index e02fd38..91a3c22 100644
--- a/lxde-openrc/packages.both
+++ b/lxde-openrc/packages.both
@@ -1,19 +1,18 @@
 #Base
 alsa-utils-openrc
 arch-install-scripts
-archinstall
 base
-bind-tools
+bind
 brltty-openrc
 btrfs-progs
 cloud-init
-crda
 cryptsetup
 darkhttpd
 ddrescue
 dhclient
 dhcpcd-openrc
 diffutils
+dmidecode
 dmraid
 dnsmasq
 dosfstools
@@ -34,6 +33,7 @@ gptfdisk
 grml-zsh-config
 grub
 hdparm-openrc
+hyperv
 irssi
 iw
 iwd
@@ -66,9 +66,9 @@ ndisc6
 networkmanager-openrc
 nfs-utils-openrc
 nilfs-utils
-nmap
 ntfs-3g
 nvme-cli
+open-iscsi
 openconnect
 openrc-init
 openssh-openrc
diff --git a/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg b/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg
index 9e0bb0e..5e44dc9 100644
--- a/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg
+++ b/lxde-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg
@@ -4,8 +4,8 @@ Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD).
 It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD)
-LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre
-INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img
+LINUX ::/%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre
+INITRD ::/%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify
 SYSAPPEND 3
 
@@ -15,8 +15,8 @@ Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS).
 It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS)
-LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre
-INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img
+LINUX ::/%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre
+INITRD ::/%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify
 SYSAPPEND 3
 
@@ -26,7 +26,7 @@ Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP).
 It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP)
-LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre
-INITRD /%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img
+LINUX ::/%INSTALL_DIR%/boot/i686/vmlinuz-linux-libre
+INITRD ::/%INSTALL_DIR%/boot/i686/initramfs-linux-libre.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify
 SYSAPPEND 3
diff --git a/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg b/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg
index 71e70c5..9868ea9 100644
--- a/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg
+++ b/lxde-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg
@@ -4,8 +4,8 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD).
 It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} checksum verify
 SYSAPPEND 3
 
@@ -15,8 +15,8 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS).
 It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt checksum verify
 SYSAPPEND 3
 
@@ -26,7 +26,7 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP).
 It allows you to install Parabola GNU/Linux-libre or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
 APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ checksum verify
 SYSAPPEND 3