various updates

[distro-setup] / filesystem / etc / systemd / system / openvpn-client-nn@.service

diff --git a/filesystem/etc/systemd/system/openvpn-client-nn@.service b/filesystem/etc/systemd/system/openvpn-client-nn@.service
index d76e194929415ab2d3065a061468912f77604d3a..ab5ccba2958e68dc5102ef62764bb25accc6651a 100644 (file)
--- a/filesystem/etc/systemd/system/openvpn-client-nn@.service
+++ b/filesystem/etc/systemd/system/openvpn-client-nn@.service
@@ -13,18 +13,20 @@ RuntimeDirectory=openvpn-client
 RuntimeDirectoryMode=0710
 WorkingDirectory=/etc/openvpn/client
 ExecStart=/usr/bin/nsenter --mount=/root/mount_namespaces/%i /usr/sbin/openvpn --suppress-timestamps --nobind --config /etc/openvpn/client/%i.conf
+# Ian: commented out these lines from upstream
 # until we get the next systemd version (233), which can do bind mounts
 # inside a mnt namespace via systemd, we have to setup our own, which requires
 # full priveledges.
+# when we enable CababilityBoundingSet, s/=/=+/ on these ExecStart/Stop lines.
+# systemd ver in flidas does not suppot =+
 #CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE
 LimitNPROC=10
 # DeviceAllow=/dev/null rw
 # DeviceAllow=/dev/net/tun rw
 
-# ian: added just these  lines from upstream
-ExecStartPre=+/a/bin/newns/newns -n 10.173.0 start %i
-ExecStartPre=+/sbin/iptables-restore /a/bin/distro-setup/transmission-firewall/netns.rules
-ExecStopPost=+/a/bin/newns/newns stop %i
+ExecStartPre=/a/bin/newns/newns -n 10.173.0 start %i
+ExecStartPre=/sbin/iptables-restore /a/bin/distro-setup/transmission-firewall/netns.rules
+ExecStopPost=/a/bin/newns/newns stop %i
 PrivateNetwork=true