systemd: update templates

systemd/^{unit}-@{res}.mount

@@ -0,0 +1,18 @@
+@eval{%let{mount}{%subst{%{unit}}{-}{/}}}
+[Unit]
+Description=MARS local mount on /@{mount}/@{res}
+Documentation=https://github.com/schoebel/mars/docu/mars-manual.pdf
+Requires=mars.service
+After=mars.service
+
+ConditionPathIsSymbolicLink=/mars/resource-@{res}/systemd-want
+ConditionPathExists=/mars/resource-@{res}/userspace/systemd-want-@{host}
+ConditionPathExists=/dev/mars/@{res}
+ConditionPathIsDirectory=/@{mount}/@{res}
+
+[Mount]
+What=/dev/mars/@{res}
+Where=/@{mount}/@{res}
+
+[Install]
+WantedBy=mars.service

systemd/dev-mars-@{res}.path

@@ -1,9 +1,12 @@
 [Unit]
 Description=MARS auto-activation of primary device /dev/mars/@{res}
-#Documentation=https://github.com/schoebel/mars/docu/mars-manual.pdf
+Documentation=https://github.com/schoebel/mars/docu/mars-manual.pdf
 Requires=mars.service
 After=mars.service
 
 [Path]
 PathExists=/dev/mars/@{res}
-Unit=vol-@escvar{res}.mount
+Unit=mnt-test-@escvar{res}.mount
+
+[Install]
+WantedBy=mars.service

systemd/mars.path

@@ -5,3 +5,6 @@ Documentation=https://github.com/schoebel/mars/docu/mars-manual.pdf
 [Path]
 PathExists=/mars/uuid
 Unit=mars.service
+
+[Install]
+WantedBy=mars.service

systemd/mars.service

@@ -5,6 +5,8 @@ RequiresMountsFor=/mars/uuid
 StopWhenUnneeded=false
 IgnoreOnIsolate=true
 
+ConditionPathIsSymbolicLink=/mars/uuid
+
 [Service]
 Type=oneshot
 RemainAfterExit=yes

systemd/vol-@{res}.mount

@@ -1,16 +0,0 @@
-[Unit]
-Description=MARS local mount on /vol/@{res}
-#Documentation=https://github.com/schoebel/mars/docu/mars-manual.pdf
-Requires=mars.service
-After=mars.service
-
-ConditionPathIsSymbolicLink=/mars/resource-@{res}/systemd-want
-ConditionPathExists=/dev/mars/@{res}
-ConditionPathIsDirectory=/vol/@{res}
-
-[Mount]
-What=/dev/mars/@{res}
-Where=/vol/@{res}
-
-[Install]
-WantedBy=mars.service