Update bootstrap script in 3006.x branch

This commit is contained in:
Shane Lee 2024-01-08 13:00:23 -07:00
parent 48eb51a412
commit eee638e516
No known key found for this signature in database
GPG key ID: 9B77EE3C5C0D9F63

View file

@ -23,7 +23,7 @@
#======================================================================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="2023.11.07"
__ScriptVersion="2024.01.04"
__ScriptName="bootstrap-salt.sh"
__ScriptFullName="$0"
@ -596,6 +596,7 @@ fi
echoinfo "Running version: ${__ScriptVersion}"
echoinfo "Executed by: ${CALLER}"
echoinfo "Command line: '${__ScriptFullName} ${__ScriptArgs}'"
echowarn "Running the unstable version of ${__ScriptName}"
# Define installation type
if [ "$#" -gt 0 ];then
@ -1521,9 +1522,9 @@ __check_dpkg_architecture() {
if [ "$_CUSTOM_REPO_URL" != "null" ]; then
warn_msg="Support for arm64 is experimental, make sure the custom repository used has the expected structure and contents."
else
# Saltstack official repository has arm64 metadata beginning with Debian 11,
# Saltstack official repository has arm64 metadata beginning with Debian 10,
# use amd64 repositories on arm64 for anything older, since all pkgs are arch-independent
if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 11 ]; then
if [ "$DISTRO_NAME_L" = "debian" ] && [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then
__REPO_ARCH="amd64"
else
__REPO_ARCH="arm64"