saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make some initial preparations for Ubuntu 18.10 support

Browse source 
Ubuntu 18.10 is not released yet, but we can make some small changes now
to make the script a little more robust for when it is released.
This commit is contained in:
rallytime 2018-07-13 14:26:10 -04:00
parent a491b71aab
commit 139583befd
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.rst
View file

@ -286,8 +286,8 @@ repositories are not provided on `SaltStack's Ubuntu repository`_ for the non-LT
bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu bootstrap script will attempt to install the packages for the most closely related LTS Ubuntu
release instead. release instead.
For example, when installing Salt on Ubuntu 17.10, the bootstrap script will setup the repository For example, when installing Salt on Ubuntu 18.10, the bootstrap script will setup the repository
for Ubuntu 16.04 from `SaltStack's Ubuntu repository`_ and install the 16.04 packages. for Ubuntu 18.04 from `SaltStack's Ubuntu repository`_ and install the 18.04 packages.
Non-LTS Ubuntu releases are not supported once the release reaches End-of-Life as defined by Non-LTS Ubuntu releases are not supported once the release reaches End-of-Life as defined by
`Ubuntu's release schedule`_. `Ubuntu's release schedule`_.

2
bootstrap-salt.sh
View file

@ -2573,7 +2573,7 @@ __enable_universe_repository() {
__install_saltstack_ubuntu_repository() { __install_saltstack_ubuntu_repository() {
# Workaround for latest non-LTS ubuntu # Workaround for latest non-LTS ubuntu
if [ "$DISTRO_MAJOR_VERSION" -gt 18 ]; then if [ "$DISTRO_MAJOR_VERSION" -gt 18 ] || [ "${DISTRO_VERSION}" -eq "18.10" ]; then
echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for latest LTS release. You may experience problems." echowarn "Non-LTS Ubuntu detected, but stable packages requested. Trying packages for latest LTS release. You may experience problems."
UBUNTU_VERSION=18.04 UBUNTU_VERSION=18.04
UBUNTU_CODENAME="bionic" UBUNTU_CODENAME="bionic"