prepare for graphical installer

place graphical binary in chimeraos/airootfs/usr/bin/chimeraos-installer.x86_64

build-iso.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -e
 if [ $EUID -ne 0 ]; then
 	echo "$(basename $0) must be run as root"
 	exit 1
@@ -32,8 +32,8 @@ AUR_PACKAGES="\
 "
 
 ADDITIONAL_PACKAGES="\
-    https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.6.13-chos1-1/linux-chimeraos-6.6.13.chos1-1-x86_64.pkg.tar.zst \
-    https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.6.13-chos1-1/linux-chimeraos-headers-6.6.13.chos1-1-x86_64.pkg.tar.zst \
+    https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.8.9-chos1-1/linux-chimeraos-6.8.9.chos1-1-x86_64.pkg.tar.zst \
+    https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.8.9-chos1-1/linux-chimeraos-headers-6.8.9.chos1-1-x86_64.pkg.tar.zst \
 "
 
 # create repo directory if it doesn't exist yet

chimeraos/airootfs/etc/hostname

@@ -1,3 +1,3 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
-chimeraos
+chimeraos-installer

chimeraos/airootfs/etc/locale.conf

@@ -1,4 +1 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-LANG=en_US.UTF-8
+LANG=C.UTF-8

chimeraos/airootfs/etc/mkinitcpio.conf.d/archiso.conf

@@ -0,0 +1,3 @@
+HOOKS=(base udev modconf kms plymouth archiso archiso_loop_mnt block filesystems)
+COMPRESSION="xz"
+COMPRESSION_OPTIONS=(-T0 -9 --memlimit=7000MiB)

chimeraos/airootfs/etc/mkinitcpio.d/linux-chimeraos.preset

@@ -1,11 +1,8 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # mkinitcpio preset file for the 'linux' package on archiso
 
 PRESETS=('archiso')
 
 ALL_kver='/boot/vmlinuz-linux-chimeraos'
-ALL_config='/etc/mkinitcpio.conf'
+archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
 
 archiso_image="/boot/initramfs-linux-chimeraos.img"

chimeraos/airootfs/etc/modules-load.d/xpad.conf

@@ -0,0 +1 @@
+xpad

chimeraos/airootfs/etc/pacman.d/hooks/10-set-logo.hook

@@ -0,0 +1,14 @@
+# remove from airootfs!
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = *
+
+[Action]
+Description = Set ChimeraOS logo in plymouth
+When = PostTransaction
+Depends = plymouth
+Depends = sh
+Depends = coreutils
+Exec = /bin/sh -c "/usr/bin/cp /usr/share/chimeraos/chimeraos-text.png /usr/share/plymouth/themes/spinner/watermark.png"

chimeraos/airootfs/etc/pam.d/gamescope

@@ -0,0 +1,4 @@
+auth           required        pam_unix.so nullok
+account        required        pam_unix.so
+session        required        pam_unix.so
+session        required        pam_systemd.so

chimeraos/airootfs/etc/ssh/sshd_config.d/10-archiso.conf

@@ -0,0 +1,3 @@
+# Allow root login using password authentication
+PasswordAuthentication yes
+PermitRootLogin yes

chimeraos/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf

@@ -1,5 +1,2 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Journal]
-Storage=volatile
+Storage=volatile

chimeraos/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf

@@ -1,7 +1,4 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Login]
 HandleSuspendKey=ignore
 HandleHibernateKey=ignore
-HandleLidSwitch=ignore
+HandleLidSwitch=ignore

chimeraos/airootfs/etc/systemd/network/20-ethernet.network

@@ -1,15 +1,21 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Match]
-Type=ether
+# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*).
+# See https://bugs.archlinux.org/task/70892
+# Instead match by globbing the network interface name.
+Name=en*
+Name=eth*
 
 [Network]
 DHCP=yes
-IPv6PrivacyExtensions=yes
+MulticastDNS=yes
 
+# systemd-networkd does not set per-interface-type default route metrics
+# https://github.com/systemd/systemd/issues/17698
+# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband.
+# Use values from NetworkManager. From nm_device_get_route_metric_default in
+# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c
 [DHCPv4]
-RouteMetric=512
+RouteMetric=100
 
-[DHCPv6]
-RouteMetric=512
+[IPv6AcceptRA]
+RouteMetric=100

chimeraos/airootfs/etc/systemd/network/20-wlan.network

@@ -1,15 +1,17 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 [Match]
-Type=wlan
+Name=wl*
 
 [Network]
 DHCP=yes
-IPv6PrivacyExtensions=yes
+MulticastDNS=yes
 
+# systemd-networkd does not set per-interface-type default route metrics
+# https://github.com/systemd/systemd/issues/17698
+# Explicitly set route metric, so that Ethernet is preferred over Wi-Fi and Wi-Fi is preferred over mobile broadband.
+# Use values from NetworkManager. From nm_device_get_route_metric_default in
+# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/src/core/devices/nm-device.c
 [DHCPv4]
-RouteMetric=1024
+RouteMetric=600
 
-[DHCPv6]
-RouteMetric=1024
+[IPv6AcceptRA]
+RouteMetric=600