summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2023-05-31 16:03:04 -0400
committerAndrew Cady <d@jerkface.net>2023-05-31 16:03:04 -0400
commitf4d917d6310784ca5908f836a15ea7477c219ab6 (patch)
tree82e714d1936f8b546465f2a7a6c3683c793c2ea2
parentfa35bae311790d72bfd03e1ac4473ec9fc2e8fd6 (diff)
simplify; remove commented out code and unused dependency
-rw-r--r--Makefile2
-rw-r--r--src/fossil-test@.service7
2 files changed, 2 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 1bbe6f1..dcc5e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ unit_files = $(addprefix src/fossil-user,@.service .socket) src/fossil-test@.ser
45units = $(filter-out %@.service,$(notdir $(unit_files))) 45units = $(filter-out %@.service,$(notdir $(unit_files)))
46executables = src/endofossil 46executables = src/endofossil
47bindir = /usr/local/bin 47bindir = /usr/local/bin
48dependencies = socat fossil ssh fakeroot libnss-systemd 48dependencies = socat fossil ssh fakeroot
49 49
50SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi 50SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi
51 51
diff --git a/src/fossil-test@.service b/src/fossil-test@.service
index c7076c4..23fdbd8 100644
--- a/src/fossil-test@.service
+++ b/src/fossil-test@.service
@@ -5,17 +5,12 @@ Description = Endofossil Test: Clone over SSH using fresh identity
5Type = oneshot 5Type = oneshot
6PrivateUsers = yes 6PrivateUsers = yes
7DynamicUser = yes 7DynamicUser = yes
8
9User = fossil-test-user-%i 8User = fossil-test-user-%i
10RuntimeDirectory = fossil-test-%i 9RuntimeDirectory = fossil-test-%i
11
12# BindPaths = /run/fossil-test-%i:/.ssh
13# Environment = FOSSIL_HOME=/.ssh
14
15BindPaths = /run/fossil-test-%i:/root/.ssh 10BindPaths = /run/fossil-test-%i:/root/.ssh
16Environment = HOME=/root FOSSIL_HOME=/root/.ssh 11Environment = HOME=/root FOSSIL_HOME=/root/.ssh
17 12
18ExecStart = sh -c '[ "$HOME" != /root ] || set -- fakeroot "$@"; "$@"' - sh -exc '\ 13ExecStart = fakeroot sh -exc '\
19cd; \ 14cd; \
20! touch /test.file 2>/dev/null; \ 15! touch /test.file 2>/dev/null; \
21mountpoint -q .ssh || ln -s . .ssh; \ 16mountpoint -q .ssh || ln -s . .ssh; \