projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19961: Merge branch 'main'
[arvados.git]
/
tools
/
compute-images
/
scripts
/
usr-local-bin-ensure-encrypted-partitions.sh
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 462158e043fc58213943aac2514081fb6fbba5ee..a76dc121096527101ee5c35e2434625d205252fb 100644
(file)
--- 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
then
sv stop docker.io || service stop docker.io || true
else
- s
ervice docker stop
|| true
+ s
ystemctl disable --now docker.service docker.socket
|| true
fi
ensure_umount "$MOUNTPATH/docker/aufs"
fi
ensure_umount "$MOUNTPATH/docker/aufs"
@@
-143,7
+143,7
@@
then
## runit
sv up docker.io
else
## runit
sv up docker.io
else
- s
ervice docker start
+ s
ystemctl enable --now docker.service docker.socket || true
fi
end=$((SECONDS+60))
fi
end=$((SECONDS+60))