From f4d917d6310784ca5908f836a15ea7477c219ab6 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Wed, 31 May 2023 16:03:04 -0400 Subject: simplify; remove commented out code and unused dependency --- Makefile | 2 +- src/fossil-test@.service | 7 +------ 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 units = $(filter-out %@.service,$(notdir $(unit_files))) executables = src/endofossil bindir = /usr/local/bin -dependencies = socat fossil ssh fakeroot libnss-systemd +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 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 Type = oneshot PrivateUsers = yes DynamicUser = yes - User = fossil-test-user-%i RuntimeDirectory = fossil-test-%i - -# 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 '\ +ExecStart = fakeroot sh -exc '\ cd; \ ! touch /test.file 2>/dev/null; \ mountpoint -q .ssh || ln -s . .ssh; \ -- cgit v1.2.3