From 15edce34a86094cc88ef54091f81576a3a25af3e Mon Sep 17 00:00:00 2001
From: "Manuel Amador (Rudd-O)" <rudd-o@rudd-o.com>
Date: Wed, 26 Feb 2025 23:43:45 +0000
Subject: [PATCH] Actually bind to qubes-network.service which starts only when
 network needs to be routed.

---
 qubes-network-server.spec            | 5 ++++-
 src/qubes-routing-manager.service.in | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/qubes-network-server.spec b/qubes-network-server.spec
index d4fd31e..485f2e6 100644
--- a/qubes-network-server.spec
+++ b/qubes-network-server.spec
@@ -3,7 +3,7 @@
 %define mybuildnumber %{?build_number}%{?!build_number:1}
 
 Name:           qubes-network-server
-Version:        0.1.3
+Version:        0.1.4
 Release:        %{mybuildnumber}%{?dist}
 Summary:        Turn your Qubes OS into a network server
 BuildArch:      noarch
@@ -93,6 +93,9 @@ tox --current-env
 %systemd_post  qubes-routing-manager.service
 
 %preun
+# Remove obsolete unit enablement paths.
+rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/qubes-routing-manager.service || true
+rm -f %{_sysconfdir}/systemd/system/qubes-iptables.service.wants/qubes-routing-manager.service || true
 %systemd_preun qubes-routing-manager.service
 
 %postun
diff --git a/src/qubes-routing-manager.service.in b/src/qubes-routing-manager.service.in
index e10d7e2..bea3b7e 100644
--- a/src/qubes-routing-manager.service.in
+++ b/src/qubes-routing-manager.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=Configure the network to allow network server VMs
 Documentation=https://github.com/Rudd-O/qubes-network-server
-After=qubes-iptables.service
+After=qubes-network.service qubes-iptables.service
 BindsTo=qubes-iptables.service
 
 [Service]
@@ -9,4 +9,4 @@ Type=notify
 ExecStart=@SBINDIR@/qubes-routing-manager
 
 [Install]
-WantedBy=qubes-iptables.service
\ No newline at end of file
+WantedBy=qubes-network.service