From 0dc6286194bb7423d163b63ae7cedd37f0629630 Mon Sep 17 00:00:00 2001
From: u <u@billy>
Date: Tue, 30 May 2023 11:02:43 -0400
Subject: fossil-test uses either fakeroot or libnss-systemd with same
 ExecStart

---
 src/fossil-test@.service | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/fossil-test@.service b/src/fossil-test@.service
index 1bdd39f..3365708 100644
--- a/src/fossil-test@.service
+++ b/src/fossil-test@.service
@@ -8,13 +8,17 @@ DynamicUser = yes
 
 User = fossil-test-user-%i
 RuntimeDirectory = fossil-test-%i
-BindPaths = /run/fossil-test-%i:/.ssh
-Environment = HOME=/run/fossil-test-%i
-WorkingDirectory = /run/fossil-test-%i
 
-ExecStart = sh -exc '\
+# BindPaths = /run/fossil-test-%i:/.ssh
+# Environment = FOSSIL_HOME=/.ssh
+
+BindPaths = /run/fossil-test-%i:/root/.ssh
+Environment = HOME=/root FOSSIL_HOME=/root/.ssh
+
+ExecStart = sh -c '[ "$HOME" != /root ] || set -- fakeroot "$@"; "$@"' - sh -exc '\
+cd; \
 ! touch /test.file; \
-ln -s . .ssh; \
+mountpoint -q .ssh || ln -s . .ssh; \
 mkdir .ssh/known_hosts.d; \
 ssh-keygen -t ed25519 -f .ssh/id_ed25519 -N ""; \
 ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new -- %i@localhost :; \
-- 
cgit v1.2.3