From 410f22af75808812fd8653d43c2a04fc19b44be5 Mon Sep 17 00:00:00 2001
From: James Swineson <github@public.swineson.me>
Date: Sun, 10 May 2020 22:58:55 -0700
Subject: [PATCH] add JoinsNamespaceOf for all netns-*@.service

---
 services/netns-bridge@.service | 4 +++-
 services/netns-mvbr@.service   | 2 ++
 services/netns-nat@.service    | 2 ++
 services/netns-tunnel@.service | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/services/netns-bridge@.service b/services/netns-bridge@.service
index 38773e8..f652963 100644
--- a/services/netns-bridge@.service
+++ b/services/netns-bridge@.service
@@ -7,6 +7,8 @@ After=netns@%i.service
 Before=network.target network-online.target
 Conflicts=netns-nat@%i.service netns-mvbr@%i.service
 
+JoinsNamespaceOf=netns@%I.service
+
 [Install]
 WantedBy=network-online.target
 WantedBy=multi-user.target
@@ -19,4 +21,4 @@ ExecStart=/usr/bin/env netnsinit bridge %I up outside
 ExecStart=/usr/bin/env ip netns exec %I /usr/bin/env netnsinit bridge %I up inside
 
 ExecStop=/usr/bin/env ip netns exec %I /usr/bin/env netnsinit bridge %I down inside
-ExecStop=/usr/bin/env netnsinit bridge %I down outside
\ No newline at end of file
+ExecStop=/usr/bin/env netnsinit bridge %I down outside
diff --git a/services/netns-mvbr@.service b/services/netns-mvbr@.service
index f9074d9..bc9f06c 100644
--- a/services/netns-mvbr@.service
+++ b/services/netns-mvbr@.service
@@ -7,6 +7,8 @@ After=netns@%i.service
 Before=network.target network-online.target
 Conflicts=netns-nat@%i.service netns-bridge@%i.service netns-tunnel@%i.service
 
+JoinsNamespaceOf=netns@%I.service
+
 [Install]
 WantedBy=network-online.target
 WantedBy=multi-user.target
diff --git a/services/netns-nat@.service b/services/netns-nat@.service
index f30ba54..537c67f 100644
--- a/services/netns-nat@.service
+++ b/services/netns-nat@.service
@@ -7,6 +7,8 @@ After=netns@%i.service
 Before=network.target network-online.target
 Conflicts=netns-bridge@%i.service
 
+JoinsNamespaceOf=netns@%I.service
+
 [Install]
 WantedBy=network-online.target
 WantedBy=multi-user.target
diff --git a/services/netns-tunnel@.service b/services/netns-tunnel@.service
index 4961c4d..405cc03 100644
--- a/services/netns-tunnel@.service
+++ b/services/netns-tunnel@.service
@@ -7,6 +7,8 @@ After=netns@%i.service
 Before=network.target network-online.target
 Conflicts=netns-mvbr@%i.service
 
+JoinsNamespaceOf=netns@%I.service
+
 [Install]
 WantedBy=network-online.target
 WantedBy=multi-user.target