From 3b6f2c1ee69565a290b2090e124f14b7f50ada3a Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: May 06 2024 22:40:19 +0000
Subject: Check network status and restart fixup service until it works


---

diff --git a/asahi-branding-fixup.service b/asahi-branding-fixup.service
index f0ac232..6c63b86 100644
--- a/asahi-branding-fixup.service
+++ b/asahi-branding-fixup.service
@@ -9,7 +9,10 @@ Wants=network-online.target
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes
+ExecStartPre=/usr/libexec/fedora-asahi-remix-scripts/check-network-online.sh
 ExecStart=/usr/libexec/fedora-asahi-remix-scripts/fixup-branding-packages.sh
+RestartSec=1h
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/check-network-online.sh b/check-network-online.sh
new file mode 100644
index 0000000..738466c
--- /dev/null
+++ b/check-network-online.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/sh
+# SPDX-License-Identifier: MIT
+
+set -eu -o pipefail
+
+# Check if network connectivity is present
+CONNECTION_STATUS="$(curl -s http://fedoraproject.org/static/hotspot.txt)"
+if [ "${CONNECTION_STATUS}" != "OK" ]; then
+    echo "No internet connectivity, exiting..."
+    exit 1
+fi
+exit 0
diff --git a/fedora-asahi-remix-scripts.spec b/fedora-asahi-remix-scripts.spec
index 42bcf77..8ca0eab 100644
--- a/fedora-asahi-remix-scripts.spec
+++ b/fedora-asahi-remix-scripts.spec
@@ -1,5 +1,5 @@
 Name:           fedora-asahi-remix-scripts
-Version:        20240424
+Version:        20240506
 Release:        1%{?dist}
 Summary:        Fedora Asahi Remix utility scripts
 
@@ -30,6 +30,7 @@ install -Dpm0644 -t %{buildroot}%{_unitdir} asahi-branding-fixup.service
 install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} install-extras.sh
 install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} setup-swap.sh
 install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} fixup-branding-packages.sh
+install -Dpm0755 -t %{buildroot}%{_libexecdir}/%{name} check-network-online.sh
 
 %post
 %systemd_post asahi-extras-firstboot.service
@@ -58,6 +59,9 @@ systemctl enable asahi-branding-fixup.service
 %{_libexecdir}/%{name}/
 
 %changelog
+* Mon May 06 2024 Neal Gompa <ngompa@fedoraproject.org> - 20240506-1
+- Check network status and restart fixup service until it works
+
 * Wed Apr 24 2024 Neal Gompa <ngompa@fedoraproject.org> - 20240424-1
 - Make fixup script catch failures and make fixup unit want network-online target