summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2022-05-29 22:35:52 -0400
committerDavid P <megver83@parabola.nu>2022-05-29 22:43:41 -0400
commitafc497623f376f2b51e30ff7e1fcf90290247340 (patch)
tree131991bd935d7f14ca7d7fbad9423beddab414c7
parenteb61bddc1e2d1ee3dee0ea8ba66bf1e2e8f7bf69 (diff)
releng-openrc: sync with releng
Signed-off-by: David P <megver83@parabola.nu>
-rwxr-xr-xreleng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector2
-rw-r--r--releng-openrc/airootfs/etc/motd2
-rw-r--r--releng-openrc/efiboot/entries/01-parabolaiso-x86_64-linux-libre.conf (renamed from releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf)0
-rw-r--r--releng-openrc/efiboot/entries/02-parabolaiso-x86_64-speech-linux-libre.conf (renamed from releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf)0
-rw-r--r--releng-openrc/efiboot/entries/03-parabolaiso-x86_64-ram-linux-libre.conf (renamed from releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf)0
-rw-r--r--releng-openrc/efiboot/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf5
-rw-r--r--releng-openrc/efiboot/refind.conf (renamed from releng-openrc/efiboot/EFI/BOOT/refind.conf)0
-rw-r--r--releng-openrc/packages.both8
-rw-r--r--releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg12
-rw-r--r--releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg12
10 files changed, 25 insertions, 16 deletions
diff --git a/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector b/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
index 76e84dd..850d048 100755
--- a/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
+++ b/releng-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/releng-openrc/airootfs/etc/motd b/releng-openrc/airootfs/etc/motd
index ee664e2..6801b24 100644
--- a/releng-openrc/airootfs/etc/motd
+++ b/releng-openrc/airootfs/etc/motd
@@ -7,3 +7,5 @@ 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/releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf b/releng-openrc/efiboot/entries/01-parabolaiso-x86_64-linux-libre.conf
index 7fec6be..7fec6be 100644
--- a/releng-openrc/efiboot/EFI/BOOT/entries/01-parabolaiso-x86_64-linux-libre.conf
+++ b/releng-openrc/efiboot/entries/01-parabolaiso-x86_64-linux-libre.conf
diff --git a/releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf b/releng-openrc/efiboot/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
index e6e8ab6..e6e8ab6 100644
--- a/releng-openrc/efiboot/EFI/BOOT/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
+++ b/releng-openrc/efiboot/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
diff --git a/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/releng-openrc/efiboot/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
index 0c635af..0c635af 100644
--- a/releng-openrc/efiboot/EFI/BOOT/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
+++ b/releng-openrc/efiboot/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
diff --git a/releng-openrc/efiboot/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf b/releng-openrc/efiboot/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf
new file mode 100644
index 0000000..f8b4ae3
--- /dev/null
+++ b/releng-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/releng-openrc/efiboot/EFI/BOOT/refind.conf b/releng-openrc/efiboot/refind.conf
index 599ee49..599ee49 100644
--- a/releng-openrc/efiboot/EFI/BOOT/refind.conf
+++ b/releng-openrc/efiboot/refind.conf
diff --git a/releng-openrc/packages.both b/releng-openrc/packages.both
index e9e2f9a..d9b6ca8 100644
--- a/releng-openrc/packages.both
+++ b/releng-openrc/packages.both
@@ -1,18 +1,17 @@
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
@@ -33,6 +32,7 @@ gptfdisk
grml-zsh-config
grub
hdparm-openrc
+hyperv
irssi
iw
iwd
@@ -65,9 +65,9 @@ ndisc6
networkmanager-openrc
nfs-utils-openrc
nilfs-utils
-nmap
ntfs-3g
nvme-cli
+open-iscsi
openconnect
openrc-init
openssh-openrc
diff --git a/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg b/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg
index 9e0bb0e..5e44dc9 100644
--- a/releng-openrc/syslinux/parabolaiso_pxe32-linux-libre.cfg
+++ b/releng-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/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg b/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg
index 71e70c5..9868ea9 100644
--- a/releng-openrc/syslinux/parabolaiso_pxe64-linux-libre.cfg
+++ b/releng-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