All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit d6e0bcfe authored by David Johnson's avatar David Johnson

Ensure that Docker/bootvnodes have a very long timeout at shutdown.

(We don't want systemd sending them SIGTERM before bootvnodes can get
them!)
parent 10d2d75d
......@@ -525,6 +525,9 @@ docker-install: dir-install
$(INSTALL) -m 644 -o root -g $(DIRGROUP) \
$(SRCDIR)/docker/sshd-docker-exec.service \
$(SYSETCDIR)/systemd/system
# Ensure we have a really long timeout on shutdown
mkdir -p $(SYSETCDIR)/systemd/system/testbed.service.d
echo "TimeoutStopSec=600" > $(SYSETCDIR)/systemd/system/testbed.service.d/docker.conf
echo "docker" > $(ETCDIR)/genvmtype
$(INSTALL) -m 755 -o root -g $(DIRGROUP) -d $(ETCDIR)/docker
$(INSTALL) -m 755 -o root -g $(DIRGROUP) -d $(ETCDIR)/docker/scripts
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment