summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2022-05-29 20:10:33 -0400
committerDavid P <megver83@parabola.nu>2022-05-29 20:19:28 -0400
commit68e730ca61b65383613d58d9ee05836b0e38f7a9 (patch)
treee8cb486dd32da57ebec56fe1b712af828609f145
parent13d41a2a2f829a80f9d377f9a01e466212ed46c8 (diff)
sync with archiso v62v62
archiso: 0b64536 (HEAD, tag: v62) CHANGELOG.rst: version 62 b5011af Merge remote-tracking branch 'origin/merge-requests/239' 07d8035 Merge remote-tracking branch 'origin/merge-requests/240' 0db3a42 configs/releng: Improve motd cec14d8 add needed files e5bdf0c configs/{baseline,releng}/: disable systemd-gpt-auto-generator 914382c Merge remote-tracking branch 'origin/merge-requests/237' 0c6ecb6 syslinux PXE: Forced all TFTP paths to be absolute parabola: * register qemu-arm-static if it is not * deprecate new blacklisted packages Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r--CHANGELOG.rst12
l---------configs/baseline/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator1
-rw-r--r--configs/releng/airootfs/etc/motd2
l---------configs/releng/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator1
-rw-r--r--configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service13
l---------configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service1
-rw-r--r--configs/releng/airootfs/etc/sysusers.d/beep.conf2
-rw-r--r--configs/releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules2
-rwxr-xr-xconfigs/releng/airootfs/usr/local/bin/pacman-beep.sh3
-rw-r--r--configs/releng/packages.both1
-rw-r--r--configs/releng/profiledef.sh2
-rw-r--r--configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg12
-rw-r--r--configs/releng/syslinux/parabolaiso_pxe64-linux-libre.cfg12
13 files changed, 52 insertions, 12 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c74d877..a17275a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,18 @@ Changed
Removed
-------
+[62] - 2022-03-31
+=================
+
+Changed
+-------
+
+- Fix the PXE support. PXELINUX was having trouble finding the kernel and initrds. Now, archiso forces syslinux to
+ interpret all TFTP paths as absolute. That seems to have solved the issue.
+- Disable systemd-gpt-auto-generator, which we do not need, in both baseline and releng profiles. It avoids the error
+ message about it failing during boot.
+- Register qemu-arm-static if it is not already, rather than suggesting installing an extra package.
+
[61] - 2022-01-31
=================
diff --git a/configs/baseline/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator b/configs/baseline/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator
new file mode 120000
index 0000000..dc1dc0c
--- /dev/null
+++ b/configs/baseline/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator
@@ -0,0 +1 @@
+/dev/null \ No newline at end of file
diff --git a/configs/releng/airootfs/etc/motd b/configs/releng/airootfs/etc/motd
index e94c5c5..fdd42e0 100644
--- a/configs/releng/airootfs/etc/motd
+++ b/configs/releng/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/configs/releng/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator b/configs/releng/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator
new file mode 120000
index 0000000..dc1dc0c
--- /dev/null
+++ b/configs/releng/airootfs/etc/systemd/system-generators/systemd-gpt-auto-generator
@@ -0,0 +1 @@
+/dev/null \ No newline at end of file
diff --git a/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service b/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service
new file mode 100644
index 0000000..8a6a41e
--- /dev/null
+++ b/configs/releng/airootfs/etc/systemd/system/pacmanbeeper.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Play pacman tune
+# for playing alert tunes via the built-in PC speaker (KDMKTONE, KIOCSOUND)
+Wants=modprobe@pcspkr.service
+After=modprobe@pcspkr.service
+
+[Service]
+User=beep
+Type=oneshot
+ExecStart=/usr/local/bin/pacman-beep.sh
+
+[Install]
+WantedBy=sound.target
diff --git a/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service b/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service
new file mode 120000
index 0000000..fc5ade0
--- /dev/null
+++ b/configs/releng/airootfs/etc/systemd/system/sound.target.wants/pacmanbeeper.service
@@ -0,0 +1 @@
+../pacmanbeeper.service \ No newline at end of file
diff --git a/configs/releng/airootfs/etc/sysusers.d/beep.conf b/configs/releng/airootfs/etc/sysusers.d/beep.conf
new file mode 100644
index 0000000..c7d10ca
--- /dev/null
+++ b/configs/releng/airootfs/etc/sysusers.d/beep.conf
@@ -0,0 +1,2 @@
+#Type Name ID GECOS Home directory Shell
+u beep - beepuser - -
diff --git a/configs/releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules b/configs/releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules
new file mode 100644
index 0000000..12a3a61
--- /dev/null
+++ b/configs/releng/airootfs/etc/udev/rules.d/90-pcspkr-beep.rules
@@ -0,0 +1,2 @@
+# Add write access to the PC speaker for the "beep" group
+ACTION=="add", SUBSYSTEM=="input", ATTRS{name}=="PC Speaker", ENV{DEVNAME}!="", RUN+="/usr/bin/setfacl -m u:beep:w '$env{DEVNAME}'"
diff --git a/configs/releng/airootfs/usr/local/bin/pacman-beep.sh b/configs/releng/airootfs/usr/local/bin/pacman-beep.sh
new file mode 100755
index 0000000..8bc1199
--- /dev/null
+++ b/configs/releng/airootfs/usr/local/bin/pacman-beep.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+# I think I converted this from a wav using https://github.com/tomas-teijeiro/wavtobeep
+beep -l 100 -f 15804.2656402 -n -l 25 -f 19.4454364826 -n -l 25 -f 123.470825314 -n -l 50 -f 554.365261954 -n -l 75 -f 138.591315488 -n -l 75 -f 1108.73052391 -n -l 50 -f 19.4454364826 -n -l 75 -f 783.990871963 -n -l 50 -f 19.4454364826 -n -l 75 -f 698.456462866 -n -l 50 -f 195.997717991 -n -l 25 -f 184.997211356 -n -l 50 -f 1108.73052391 -n -l 75 -f 783.990871963 -n -l 100 -f 138.591315488 -n -l 25 -f 155.563491861 -n -l 150 -f 698.456462866 -n -l 125 -f 195.997717991 -n -l 50 -f 554.365261954 -n -l 25 -f 587.329535835 -n -l 50 -f 138.591315488 -n -l 75 -f 1108.73052391 -n -l 50 -f 19.4454364826 -n -l 75 -f 880.0 -n -l 25 -f 38.8908729653 -n -l 25 -f 19.4454364826 -n -l 75 -f 739.988845423 -n -l 75 -f 220.0 -n -l 75 -f 1108.73052391 -n -l 50 -f 880.0 -n -l 25 -f 19.4454364826 -n -l 75 -f 138.591315488 -n -l 25 -f 123.470825314 -n -l 150 -f 739.988845423 -n -l 125 -f 220.0 -n -l 75 -f 554.365261954 -n -l 50 -f 138.591315488 -n -l 75 -f 1108.73052391 -n -l 25 -f 1046.5022612 -n -l 25 -f 1108.73052391 -n -l 25 -f 19.4454364826 -n -l 50 -f 783.990871963 -n -l 25 -f 830.60939516 -n -l 25 -f 19.4454364826 -n -l 25 -f 622.253967444 -n -l 75 -f 698.456462866 -n -l 50 -f 195.997717991 -n -l 25 -f 155.563491861 -n -l 50 -f 1108.73052391 -n -l 75 -f 783.990871963 -n -l 100 -f 138.591315488 -n -l 25 -f 19.4454364826 -n -l 125 -f 698.456462866 -n -l 150 -f 195.997717991 -n -l 50 -f 622.253967444 -n -l 75 -f 698.456462866 -n -l 75 -f 739.988845423 -n -l 25 -f 19.4454364826 -n -l 25 -f 38.8908729653 -n -l 125 -f 739.988845423 -n -l 100 -f 783.990871963 -n -l 25 -f 19.4454364826 -n -l 75 -f 783.990871963 -n -l 150 -f 880.0 -n -l 50 -f 19.4454364826 -n -l 125 -f 1108.73052391 -n -l 75 -f 261.625565301 -n -l 25 -f 277.182630977 -n -l 25 -f 261.625565301
diff --git a/configs/releng/packages.both b/configs/releng/packages.both
index 25fc971..dae7bd8 100644
--- a/configs/releng/packages.both
+++ b/configs/releng/packages.both
@@ -1,6 +1,7 @@
alsa-utils
arch-install-scripts
base
+beep
bind-tools
brltty
btrfs-progs
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
index 8ca837f..6aa4deb 100644
--- a/configs/releng/profiledef.sh
+++ b/configs/releng/profiledef.sh
@@ -20,4 +20,6 @@ file_permissions=(
["/usr/local/bin/choose-mirror"]="0:0:755"
["/usr/local/bin/Installation_guide"]="0:0:755"
["/usr/local/bin/livecd-sound"]="0:0:755"
+ ["/usr/local/bin/pacman-beep.sh"]="0:0:755"
)
+
diff --git a/configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg
index 9e0bb0e..5e44dc9 100644
--- a/configs/releng/syslinux/parabolaiso_pxe32-linux-libre.cfg
+++ b/configs/releng/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/configs/releng/syslinux/parabolaiso_pxe64-linux-libre.cfg b/configs/releng/syslinux/parabolaiso_pxe64-linux-libre.cfg
index 71e70c5..9868ea9 100644
--- a/configs/releng/syslinux/parabolaiso_pxe64-linux-libre.cfg
+++ b/configs/releng/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