From 4eaf22fc59754a8e68833f5c1789285f3eba6ea6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 30 Mar 2023 17:21:59 -0700 Subject: [PATCH] Don't include SALT-PROJECT-GPG-PUBKEY-2023.pub if it's not found. --- bootstrap-salt.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 2c122b2..1cb87fc 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -4556,7 +4556,7 @@ __install_saltstack_rhel_onedir_repository() { if [ "${DISTRO_MAJOR_VERSION}" -eq 9 ]; then gpg_key="SALTSTACK-GPG-KEY2.pub" else - gpg_key="SALTSTACK-GPG-KEY.pub SALT-PROJECT-GPG-PUBKEY-2023.pub" + gpg_key="SALTSTACK-GPG-KEY.pub" fi fi else @@ -6729,6 +6729,12 @@ install_arch_check_services() { return 0 } + +install_arch_linux_onedir() { + install_arch_linux_stable || return 1 + + return 0 +} # # Ended Arch Install Functions #