Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add stub support for Ubuntu 21.04 non-LTS to use Ubuntu 20.04 packages #1559

Merged
merged 3 commits into from May 7, 2021
Merged

Add stub support for Ubuntu 21.04 non-LTS to use Ubuntu 20.04 packages #1559

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1f17e1
Add a stubber support for Ubuntu 21.04 non-LTS to use Ubuntu 20.04 pa…
krionbsd May 7, 2021
a5f13a1
shorten bits
krionbsd May 7, 2021
3bc8f72
Merge branch 'develop' into ub21
krionbsd May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions bootstrap-salt.sh
View file
Open in desktop
Expand Up @@ -1457,6 +1457,9 @@ __ubuntu_codename_translation() {
"20")
DISTRO_CODENAME="focal"
;;
"21")
DISTRO_CODENAME="hirsute"
;;
*)
DISTRO_CODENAME="trusty"
;;
Expand Down Expand Up @@ -2911,8 +2914,9 @@ __enable_universe_repository() {
}

__install_saltstack_ubuntu_repository() {
# Workaround for latest non-LTS ubuntu
if { [ "$DISTRO_MAJOR_VERSION" -eq 20 ] && [ "$DISTRO_MINOR_VERSION" -eq 10 ]; }; then
# 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
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"
Expand Down Expand Up @@ -3035,7 +3039,7 @@ install_ubuntu_stable_deps() {

if [ "${_UPGRADE_SYS}" -eq $BS_TRUE ]; then
if [ "${_INSECURE_DL}" -eq $BS_TRUE ]; then
if [ "$DISTRO_MAJOR_VERSION" -ge 20 ]; then
if [ "$DISTRO_MAJOR_VERSION" -ge 20 ] || [ "$DISTRO_MAJOR_VERSION" -ge 21 ]; then
__apt_get_install_noinput --allow-unauthenticated debian-archive-keyring && apt-get update || return 1
else
__apt_get_install_noinput --allow-unauthenticated debian-archive-keyring &&
Expand Down