#695: Renames reaper autostart variable in systemd template.

jdeathe · Jun 13, 2019 · 6b2eb19 · 6b2eb19
1 parent 6ef33d5
commit 6b2eb19
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/etc/systemd/system/[email protected] b/src/etc/systemd/system/[email protected]
@@ -131,9 +131,9 @@ ExecStartPre=-/bin/bash -c \
 ExecStart=/bin/bash -c \
   "exec /usr/bin/docker run \
     --name %p.%i \
+    --env \"ENABLE_REAPER=${ENABLE_REAPER}\" \
     --env \"REAPER_TIMEOUT=${REAPER_TIMEOUT}\" \
     --env \"SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS}\" \
-    --env \"SSH_AUTOSTART_REAPER=${SSH_AUTOSTART_REAPER}\" \
     --env \"SSH_AUTOSTART_SSHD=${SSH_AUTOSTART_SSHD}\" \
     --env \"SSH_AUTOSTART_SSHD_BOOTSTRAP=${SSH_AUTOSTART_SSHD_BOOTSTRAP}\" \
     --env \"SSH_AUTOSTART_SUPERVISOR_STDOUT=${SSH_AUTOSTART_SUPERVISOR_STDOUT}\" \

diff --git a/src/opt/scmi/service-unit.sh b/src/opt/scmi/service-unit.sh
@@ -9,7 +9,6 @@ readonly SERVICE_UNIT_ENVIRONMENT_KEYS="
  ENABLE_REAPER
  REAPER_TIMEOUT
  SSH_AUTHORIZED_KEYS
- SSH_AUTOSTART_REAPER
  SSH_AUTOSTART_SSHD
  SSH_AUTOSTART_SSHD_BOOTSTRAP
  SSH_AUTOSTART_SUPERVISOR_STDOUT