summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Ritter2024-02-08 19:27:27 +0100
committerSteffen Ritter2024-02-08 19:27:27 +0100
commita051ae95220a0cf53e11bfbc4d2993a9ab31abf9 (patch)
tree40011ecf810ce75468beefa4597515c2c73b291b
parent[SSPS] Expand alias with sudo (diff)
downloadsetup-scripts-a051ae95220a0cf53e11bfbc4d2993a9ab31abf9.tar.gz
setup-scripts-a051ae95220a0cf53e11bfbc4d2993a9ab31abf9.tar.xz
setup-scripts-a051ae95220a0cf53e11bfbc4d2993a9ab31abf9.zip
[SS?S] Use correct tmate config file
-rw-r--r--satellit_installer/static_files/system/etc/tmux.conf (renamed from satellit_installer/static_files/system/etc/tmate.conf)0
-rw-r--r--satellit_upgrader/updater.template.sh2
2 files changed, 1 insertions, 1 deletions
diff --git a/satellit_installer/static_files/system/etc/tmate.conf b/satellit_installer/static_files/system/etc/tmux.conf
index 537f52c..537f52c 100644
--- a/satellit_installer/static_files/system/etc/tmate.conf
+++ b/satellit_installer/static_files/system/etc/tmux.conf
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 85066dd..9ecbc88 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -853,7 +853,7 @@ if ! which tmate &> /dev/null && (( MAJOR >= 9 )); then
fi
if (( MAJOR >= 11 )); then
# Fingerprints now need to be SHA256, maybe an old sat got dist-upgraded and still has MD5s in that file
- diffcp "system" "/etc/tmate.conf" "Updating tmate config..."
+ diffcp "system" "/etc/tmux.conf" "Updating tmate config..."
rm -f -- "/root/.tmate.conf"
fi