From 83deb3f45fac5dff0ea8739532064484b757592e Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 1 Sep 2022 16:47:02 -0400 Subject: [PATCH] Use "systemctl disable" instead of "service docker stop" refs #19439 "service docker stop" stops the daemon but it can be restarted from prematurely by socket activation. Whoops! We need to use "systemctl disable" it so that it doesn't wake up during the scratch space surgery on the /tmp directory. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- ...local-bin-ensure-encrypted-partitions-aws-ebs-autoscale.sh | 4 ++-- .../scripts/usr-local-bin-ensure-encrypted-partitions.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions-aws-ebs-autoscale.sh b/tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions-aws-ebs-autoscale.sh index 4b73c8bc4f..abc63a2e92 100644 --- a/tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions-aws-ebs-autoscale.sh +++ b/tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions-aws-ebs-autoscale.sh @@ -24,7 +24,7 @@ if [ -d /etc/sv/docker.io ] then sv stop docker.io || service stop docker.io || true else - service docker stop || true + systemctl disable --now docker.service docker.socket || true fi ensure_umount "$MOUNTPATH/docker/aufs" @@ -44,7 +44,7 @@ then ## runit sv up docker.io else - service docker start + systemctl enable --now docker.service docker.socket fi end=$((SECONDS+60)) diff --git a/tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions.sh b/tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions.sh index 462158e043..a76dc12109 100644 --- a/tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions.sh +++ b/tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions.sh @@ -121,7 +121,7 @@ if [ -d /etc/sv/docker.io ] then sv stop docker.io || service stop docker.io || true else - service docker stop || true + systemctl disable --now docker.service docker.socket || true fi ensure_umount "$MOUNTPATH/docker/aufs" @@ -143,7 +143,7 @@ then ## runit sv up docker.io else - service docker start + systemctl enable --now docker.service docker.socket || true fi end=$((SECONDS+60)) -- 2.39.5