From fb8105c15ee13774a4be5f56394cfcb75e49a438 Mon Sep 17 00:00:00 2001
From: Bo Zhang <zhangbodut@gmail.com>
Date: Fri, 7 Jan 2022 09:06:27 +0800
Subject: [PATCH] Support Non-LTS Ubuntu 21.04 & 21.10

Ubuntu 21.10 is out, adjust the script accordingly.
---
 bootstrap-salt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 2b85597..dc4f471 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -2919,7 +2919,7 @@ __enable_universe_repository() {
 __install_saltstack_ubuntu_repository() {
     # Workaround for latest non-LTS Ubuntu
     if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; } || \
-        { [ "$DISTRO_MAJOR_VERSION" -eq 21 ] && [ "$DISTRO_MINOR_VERSION" -eq 04 ]; }; then
+        [ "$DISTRO_MAJOR_VERSION" -eq 21 ]; then
         echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for previous LTS release. You may experience problems."
         UBUNTU_VERSION=20.04
         UBUNTU_CODENAME="focal"