make_tree_file: better handling of the kernel.org ssh key

[next-scripts] / make_tree_file

diff --git a/make_tree_file b/make_tree_file
index 6504f0df396a6ebc8e90f3d265025cf368ffc072..a9cc15b3d00c64af65cd10a6e16ece1cdf28c5ae 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -12,7 +12,9 @@ h=$(date '+%k')
 # allow kisskb to use more of ka2
 #ssh $build_host /usr/local/bin/set-kisskb-jfactor 48
 
-ssh-add -t 600 $ssh_key_file || exit 1
+trap "ssh-add -d $ssh_key_file" EXIT
+
+ssh-add $ssh_key_file || exit 1
 
 if ! ssh git@gitolite.kernel.org 2fa isval; then
        read -r -p "Yubikey token: " tok