From 7b05a7c585da23b5eb2d688386faca99d6c7e000 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 9 Mar 2026 23:02:10 -0600
Subject: [PATCH] fix: add network dependency to start-tunneld and rename web
 reset to uninit

Add After/Wants network-online.target to prevent race where
start-tunneld starts before the network interface is up, causing
missing MASQUERADE rules. Rename `web reset` to `web uninit` for
clarity.
---
 core/locales/i18n.yaml     | 26 ++++++++++++++++++++------
 core/src/tunnel/web.rs     |  4 ++--
 core/start-tunneld.service |  2 ++
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/core/locales/i18n.yaml b/core/locales/i18n.yaml
index 45a75fdc9..d0f92d305 100644
--- a/core/locales/i18n.yaml
+++ b/core/locales/i18n.yaml
@@ -857,6 +857,13 @@ error.set-sys-info:
   fr_FR: "Erreur de Définition des Infos Système"
   pl_PL: "Błąd Ustawiania Informacji o Systemie"
 
+error.bios:
+  en_US: "BIOS/UEFI Error"
+  de_DE: "BIOS/UEFI-Fehler"
+  es_ES: "Error de BIOS/UEFI"
+  fr_FR: "Erreur BIOS/UEFI"
+  pl_PL: "Błąd BIOS/UEFI"
+
 # disk/main.rs
 disk.main.disk-not-found:
   en_US: "StartOS disk not found."
@@ -2914,6 +2921,13 @@ help.arg.log-limit:
   fr_FR: "Nombre maximum d'entrées de journal"
   pl_PL: "Maksymalna liczba wpisów logu"
 
+help.arg.merge:
+  en_US: "Merge with existing version range instead of replacing"
+  de_DE: "Mit vorhandenem Versionsbereich zusammenführen statt ersetzen"
+  es_ES: "Combinar con el rango de versiones existente en lugar de reemplazar"
+  fr_FR: "Fusionner avec la plage de versions existante au lieu de remplacer"
+  pl_PL: "Połącz z istniejącym zakresem wersji zamiast zastępować"
+
 help.arg.mirror-url:
   en_US: "URL of the mirror"
   de_DE: "URL des Spiegels"
@@ -5204,12 +5218,12 @@ about.reset-user-interface-password:
   fr_FR: "Réinitialiser le mot de passe de l'interface utilisateur"
   pl_PL: "Zresetuj hasło interfejsu użytkownika"
 
-about.reset-webserver:
-  en_US: "Reset the webserver"
-  de_DE: "Den Webserver zurücksetzen"
-  es_ES: "Restablecer el servidor web"
-  fr_FR: "Réinitialiser le serveur web"
-  pl_PL: "Zresetuj serwer internetowy"
+about.uninitialize-webserver:
+  en_US: "Uninitialize the webserver"
+  de_DE: "Den Webserver deinitialisieren"
+  es_ES: "Desinicializar el servidor web"
+  fr_FR: "Désinitialiser le serveur web"
+  pl_PL: "Zdezinicjalizuj serwer internetowy"
 
 about.restart-server:
   en_US: "Restart the server"
diff --git a/core/src/tunnel/web.rs b/core/src/tunnel/web.rs
index 04e7f84c0..7e3eec70d 100644
--- a/core/src/tunnel/web.rs
+++ b/core/src/tunnel/web.rs
@@ -168,10 +168,10 @@ pub fn web_api<C: Context>() -> ParentHandler<C> {
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
-            "reset",
+            "uninit",
             from_fn_async(reset_web)
                 .no_display()
-                .with_about("about.reset-webserver")
+                .with_about("about.uninitialize-webserver")
                 .with_call_remote::<CliContext>(),
         )
 }
diff --git a/core/start-tunneld.service b/core/start-tunneld.service
index b0d0a2043..402326614 100644
--- a/core/start-tunneld.service
+++ b/core/start-tunneld.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=StartTunnel
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=simple