From 8ce76d1e6d613b13f0d99f1507235eef33e6a293 Mon Sep 17 00:00:00 2001
From: gram-signal <84339875+gram-signal@users.noreply.github.com>
Date: Wed, 2 Oct 2024 13:41:41 -0700
Subject: [PATCH] Put Control binary in same location on all machines, in
 /bin/svr{2,3}control.

---
 docker/Dockerfile   | 6 ++++--
 trustedimage/gcp.sh | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 83843fd..ba5fe11 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -140,8 +140,8 @@ RUN apt-get update && apt-get install -y \
     libcurl4
 COPY host/main /bin/svr2
 COPY enclave/releases/sgx /enclaves
-COPY host/cmd/control/control /bin/svr2control
-RUN ln -s /bin/svr2control /bin/svr3control
+COPY host/cmd/control/control /bin/svr3control
+RUN ln -s /bin/svr3control /bin/svr2control
 
 ENTRYPOINT ["/bin/svr2"]
 
@@ -188,4 +188,6 @@ COPY docker/nitro_start.sh nitro_start.sh
 RUN mkdir /releases
 COPY enclave/releases/nitro/* /releases
 COPY host/main /bin/svr2
+COPY host/cmd/control/control /bin/svr3control
+RUN ln -s /bin/svr3control /bin/svr2control
 ENTRYPOINT ["./nitro_start.sh"]
diff --git a/trustedimage/gcp.sh b/trustedimage/gcp.sh
index 7aa25ff..cc9e2fb 100755
--- a/trustedimage/gcp.sh
+++ b/trustedimage/gcp.sh
@@ -25,6 +25,7 @@ function rm_blob() {
 }
 trap rm_blob EXIT
 $GCLOUD storage cp ../host/main gs://$GCP_BUCKET/svr3-$VERSION
+$GCLOUD storage cp ../host/cmd/control/control gs://$GCP_BUCKET/svr3control-$VERSION
 tar --transform="s/$(basename $FROM)/disk.raw/" --format=oldgnu -cvf - -C $(dirname $FROM) $(basename $FROM) | pigz >gcp.tar.gz
 if [ -z "$GCP_JUMPHOST" ]; then
   $GCLOUD storage cp ./gcp.tar.gz $BLOB