From 25385a2bfc903d74029cf3909df9bc328123fd5c Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 9 Nov 2024 06:20:52 +0100
Subject: [PATCH] try to fix networking

---
 airootfs/etc/systemd/network/20-ethernet.network              | 3 +++
 airootfs/etc/systemd/network/20-wireless.network              | 3 +++
 airootfs/etc/systemd/system/abrechenbarkeit@.service          | 4 +++-
 airootfs/etc/systemd/system/configure_wpa.service             | 2 +-
 .../etc/systemd/system/wpa_supplicant.service.d/override.conf | 4 ++++
 packages.x86_64                                               | 1 +
 6 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 airootfs/etc/systemd/system/wpa_supplicant.service.d/override.conf

diff --git a/airootfs/etc/systemd/network/20-ethernet.network b/airootfs/etc/systemd/network/20-ethernet.network
index 154417b..ea81109 100644
--- a/airootfs/etc/systemd/network/20-ethernet.network
+++ b/airootfs/etc/systemd/network/20-ethernet.network
@@ -1,6 +1,9 @@
 [Match]
 Type=ether
 
+[Link]
+RequiredForOnline=routable
+
 [Network]
 DHCP=yes
 MulticastDNS=yes
diff --git a/airootfs/etc/systemd/network/20-wireless.network b/airootfs/etc/systemd/network/20-wireless.network
index a19489f..62e9f3d 100644
--- a/airootfs/etc/systemd/network/20-wireless.network
+++ b/airootfs/etc/systemd/network/20-wireless.network
@@ -1,6 +1,9 @@
 [Match]
 Type=wlan
 
+[Link]
+RequiredForOnline=routable
+
 [Network]
 DHCP=yes
 MulticastDNS=yes
diff --git a/airootfs/etc/systemd/system/abrechenbarkeit@.service b/airootfs/etc/systemd/system/abrechenbarkeit@.service
index be7649b..203c456 100644
--- a/airootfs/etc/systemd/system/abrechenbarkeit@.service
+++ b/airootfs/etc/systemd/system/abrechenbarkeit@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=User interface for abrechenbarkeit
-After=systemd-user-sessions.service plymouth-quit-wait.service
+After=systemd-user-sessions.service
 Before=graphical.target
 ConditionPathExists=/dev/tty0
 Wants=dbus.socket systemd-logind.service
@@ -9,6 +9,8 @@ Conflicts=getty@%i.service
 After=getty@%i.service
 After=dev-dri-card1.device
 Requires=dev-dri-card1.device
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple
diff --git a/airootfs/etc/systemd/system/configure_wpa.service b/airootfs/etc/systemd/system/configure_wpa.service
index 9fd5fc0..075aa52 100644
--- a/airootfs/etc/systemd/system/configure_wpa.service
+++ b/airootfs/etc/systemd/system/configure_wpa.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Generate wpa_supplicant config from EFI variables
-After=systemd-user-sessions.service
 Before=wpa_supplicant.service
+ConditionPathExists=/sys/firmware/efi/efivars/WlanSSID-97b6e7a4-b8a6-4d85-b7c4-0030bb5f2d38
 
 [Service]
 Type=simple
diff --git a/airootfs/etc/systemd/system/wpa_supplicant.service.d/override.conf b/airootfs/etc/systemd/system/wpa_supplicant.service.d/override.conf
new file mode 100644
index 0000000..756f8ba
--- /dev/null
+++ b/airootfs/etc/systemd/system/wpa_supplicant.service.d/override.conf
@@ -0,0 +1,4 @@
+[Unit]
+Requires=configure_wpa.service
+After=configure_wpa.service
+ConditionPathExists=/sys/firmware/efi/efivars/WlanSSID-97b6e7a4-b8a6-4d85-b7c4-0030bb5f2d38
diff --git a/packages.x86_64 b/packages.x86_64
index ebfacf3..f22f9e3 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -1,5 +1,6 @@
 base
 linux
+linux-firmware
 mkinitcpio
 mkinitcpio-archiso
 open-vm-tools