diff options
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 5 | ||||
| m--------- | mcp/scripts/pharos | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 3dee9c51f..a1f347cb6 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -151,8 +151,9 @@ function cleanup_mounts { function cleanup_uefi { # Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy - # shellcheck disable=SC2086 - ssh ${SSH_OPTS} "${SSH_SALT}" "sudo salt -C 'kvm* or cmp*' cmd.run \ + local cmd_str="ssh ${SSH_OPTS} ${SSH_SALT}" + [ ! "$(hostname)" = 'cfg01' ] || cmd_str='eval' + ${cmd_str} "sudo salt -C 'kvm* or cmp*' cmd.run \ \"which efibootmgr > /dev/null 2>&1 && \ efibootmgr | grep -oP '(?<=Boot)[0-9]+(?=.*ubuntu)' | \ xargs -I{} efibootmgr --delete-bootnum --bootnum {}; \ diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject cf19f9ee69eacc1189cbeb746b30e3a09eaeac9 +Subproject 89d7cb905bf6f286648638f5865884ac5e332e5 |