add JoinsNamespaceOf for all netns-*@.service

Jamesits · Jamesits · commit 410f22af7580 · 2020-05-10T22:58:55.000-07:00
diff --git 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
+ExecStop=/usr/bin/env netnsinit bridge %I down outside
diff --git 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
@@ -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
@@ -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
