2 files changed, 10 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 38f8130..eef184c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ unit_files = $(addprefix src/fossil-user,@.service .socket) src/fossil-test@.ser
 units = $(filter-out %@.service,$(notdir $(unit_files)))
 executables = src/endofossil
 bindir = /usr/local/bin
-dependencies = socat fossil ssh
+dependencies = socat fossil ssh fakeroot
 
 SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi
 
diff --git a/src/fossil-test@.service b/src/fossil-test@.service
index c1ad063..8498733 100644
--- a/src/fossil-test@.service
+++ b/src/fossil-test@.service
@@ -3,10 +3,16 @@ Description = Test Endofossil by attempting a clone
 
 [Service]
 Type = oneshot
+DynamicUser = yes
+User = fossil-test-user-%i
+PrivateUsers = yes
 RuntimeDirectory = fossil-test-%i
 WorkingDirectory = /run/fossil-test-%i
+Environment = HOME=/run/fossil-test-%i
+BindPaths = /run/fossil-test-%i:/root
+
 ExecStart = sh -xc 'mkdir .ssh'
-ExecStart = sh -xc 'ssh-keygen -t ed25519 -f .ssh/id_ed25519 -N ""'
-ExecStart = sh -xc 'HOME=. ssh %i@localhost fossil test-http src/fossil/db'
-ExecStart = sh -xc 'HOME=. fossil clone ssh://%i@localhost/src/fossil/db db~$(date -Ins).fossil'
+ExecStart = sh -xc 'fakeroot ssh-keygen -t ed25519 -f .ssh/id_ed25519 -N ""'
+ExecStart = sh -xc 'fakeroot ssh -o UserKnownHostsFile=.ssh/known_hosts -o StrictHostKeyChecking=accept-new -i .ssh/id_ed25519 %i@localhost fossil test-http src/fossil/db'
+ExecStart = sh -xc 'fakeroot fossil clone ssh://%i@localhost/src/fossil/db db~$(date -Ins).fossil'