From 2a0eff07c0f50488e2959675ab467786e09807fe Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Wed, 15 Mar 2023 17:49:09 +0100
Subject: [PATCH] fix cleanup of deploypass

---
 cluster/staging/app/convertsecrets | 1 -
 sshtool                            | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 120000 cluster/staging/app/convertsecrets

diff --git a/cluster/staging/app/convertsecrets b/cluster/staging/app/convertsecrets
deleted file mode 120000
index 3e30b0f..0000000
--- a/cluster/staging/app/convertsecrets
+++ /dev/null
@@ -1 +0,0 @@
-../../../secretmgr/convertsecrets
\ No newline at end of file
diff --git a/sshtool b/sshtool
index eb4627a..6841bd6 100755
--- a/sshtool
+++ b/sshtool
@@ -33,13 +33,14 @@ fi
 SSH_CONFIG=cluster/$CLUSTER/ssh_config
 
 function header {
+	RANDNAME=$(openssl rand -hex 12)
 	cat <<EOF
-cat > /tmp/deploytool_askpass <<EOG
+cat > /tmp/deploytool_askpass_$RANDNAME <<EOG
 #!/usr/bin/env sh
 echo "\\\$DEPLOYTOOL_ROOT_PASSWORD"
 EOG
-chmod +x /tmp/deploytool_askpass
-export SUDO_ASKPASS=/tmp/deploytool_askpass
+chmod +x /tmp/deploytool_askpass_$RANDNAME
+export SUDO_ASKPASS=/tmp/deploytool_askpass_$RANDNAME
 export DEPLOYTOOL_ROOT_PASSWORD="$ROOT_PASS"
 sudo -A sh - <<'EOEVERYTHING'
 set -e
@@ -47,8 +48,8 @@ EOF
 }
 
 function footer {
+	echo rm -v '/tmp/deploytool_askpass*'
 	echo EOEVERYTHING
-	echo rm /tmp/deploytool_askpass
 }
 
 function message {