From: Ward Vandewege <ward@curii.com>
Date: Thu, 25 Feb 2021 22:52:24 +0000 (-0500)
Subject: When a compute node comes up, we run `mkfs.xfs` on a newly encrypted
X-Git-Tag: 2.2.0~117
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/affd80401d1ce578de5216a5328949d759ab495c

When a compute node comes up, we run `mkfs.xfs` on a newly encrypted
partition. Sometimes there are ghost filesystem signatures on those
partitions, make mkfs.xfs ignore partition signatures.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

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 08579bf192..462158e043 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
@@ -114,7 +114,7 @@ head -c321 /dev/urandom >"$KEYPATH"
 echo YES | cryptsetup luksFormat "$LVPATH" "$KEYPATH"
 cryptsetup --key-file "$KEYPATH" luksOpen "$LVPATH" "$(basename "$CRYPTPATH")"
 shred -u "$KEYPATH"
-mkfs.xfs "$CRYPTPATH"
+mkfs.xfs -f "$CRYPTPATH"
 
 # First make sure docker is not using /tmp, then unmount everything under it.
 if [ -d /etc/sv/docker.io ]