|
26 | 26 | #====================================================================================================================== |
27 | 27 | set -o nounset # Treat unset variables as an error |
28 | 28 |
|
29 | | -__ScriptVersion="2024.12.03" |
| 29 | +__ScriptVersion="2024.12.09" |
30 | 30 | __ScriptName="bootstrap-salt.sh" |
31 | 31 |
|
32 | 32 | __ScriptFullName="$0" |
@@ -3053,8 +3053,9 @@ __install_saltstack_ubuntu_onedir_repository() { |
3053 | 3053 | echo "Pin: version $ONEDIR_REV.*" >> /etc/apt/preferences.d/salt-pin-1001 |
3054 | 3054 | echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/salt-pin-1001 |
3055 | 3055 | elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
| 3056 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
3056 | 3057 | echo "Package: salt-*" > /etc/apt/preferences.d/salt-pin-1001 |
3057 | | - echo "Pin: version $ONEDIR_REV" >> /etc/apt/preferences.d/salt-pin-1001 |
| 3058 | + echo "Pin: version $ONEDIR_REV_DOT" >> /etc/apt/preferences.d/salt-pin-1001 |
3058 | 3059 | echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/salt-pin-1001 |
3059 | 3060 | fi |
3060 | 3061 | fi |
@@ -3506,8 +3507,10 @@ __install_saltstack_debian_repository() { |
3506 | 3507 | echo "Pin: version $STABLE_REV.*" >> /etc/apt/preferences.d/salt-pin-1001 |
3507 | 3508 | echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/salt-pin-1001 |
3508 | 3509 | elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
| 3510 | + STABLE_REV_DOT=$(echo "$STABLE_REV" | sed 's/-/\./') |
| 3511 | + MINOR_VER_STRG="-$STABLE_REV_DOT" |
3509 | 3512 | echo "Package: salt-*" > /etc/apt/preferences.d/salt-pin-1001 |
3510 | | - echo "Pin: version $STABLE_REV" >> /etc/apt/preferences.d/salt-pin-1001 |
| 3513 | + echo "Pin: version $STABLE_REV_DOT" >> /etc/apt/preferences.d/salt-pin-1001 |
3511 | 3514 | echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/salt-pin-1001 |
3512 | 3515 | fi |
3513 | 3516 | fi |
@@ -3549,8 +3552,9 @@ __install_saltstack_debian_onedir_repository() { |
3549 | 3552 | echo "Pin: version $ONEDIR_REV.*" >> /etc/apt/preferences.d/salt-pin-1001 |
3550 | 3553 | echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/salt-pin-1001 |
3551 | 3554 | elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
| 3555 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
3552 | 3556 | echo "Package: salt-*" > /etc/apt/preferences.d/salt-pin-1001 |
3553 | | - echo "Pin: version $ONEDIR_REV" >> /etc/apt/preferences.d/salt-pin-1001 |
| 3557 | + echo "Pin: version $ONEDIR_REV_DOT" >> /etc/apt/preferences.d/salt-pin-1001 |
3554 | 3558 | echo "Pin-Priority: 1001" >> /etc/apt/preferences.d/salt-pin-1001 |
3555 | 3559 | fi |
3556 | 3560 | fi |
@@ -3895,9 +3899,10 @@ __install_saltstack_fedora_onedir_repository() { |
3895 | 3899 | fi |
3896 | 3900 | elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
3897 | 3901 | # using minor version |
3898 | | - echo "[salt-repo-${ONEDIR_REV}-lts]" > "${YUM_REPO_FILE}" |
| 3902 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
| 3903 | + echo "[salt-repo-${ONEDIR_REV_DOT}-lts]" > "${YUM_REPO_FILE}" |
3899 | 3904 | # shellcheck disable=SC2129 |
3900 | | - echo "name=Salt Repo for Salt v${ONEDIR_REV} LTS" >> "${YUM_REPO_FILE}" |
| 3905 | + echo "name=Salt Repo for Salt v${ONEDIR_REV_DOT} LTS" >> "${YUM_REPO_FILE}" |
3901 | 3906 | echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}" |
3902 | 3907 | echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}" |
3903 | 3908 | echo "priority=10" >> "${YUM_REPO_FILE}" |
@@ -4140,7 +4145,8 @@ install_fedora_onedir() { |
4140 | 4145 | MINOR_VER_STRG="" |
4141 | 4146 | elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
4142 | 4147 | # Minor version Salt, need to add specific minor version |
4143 | | - MINOR_VER_STRG="-$STABLE_REV" |
| 4148 | + STABLE_REV_DOT=$(echo "$STABLE_REV" | sed 's/-/\./') |
| 4149 | + MINOR_VER_STRG="-$STABLE_REV_DOT" |
4144 | 4150 | else |
4145 | 4151 | MINOR_VER_STRG="" |
4146 | 4152 | fi |
@@ -4223,9 +4229,10 @@ __install_saltstack_rhel_onedir_repository() { |
4223 | 4229 | fi |
4224 | 4230 | elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
4225 | 4231 | # using minor version |
4226 | | - echo "[salt-repo-${ONEDIR_REV}-lts]" > "${YUM_REPO_FILE}" |
| 4232 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
| 4233 | + echo "[salt-repo-${ONEDIR_REV_DOT}-lts]" > "${YUM_REPO_FILE}" |
4227 | 4234 | # shellcheck disable=SC2129 |
4228 | | - echo "name=Salt Repo for Salt v${ONEDIR_REV} LTS" >> "${YUM_REPO_FILE}" |
| 4235 | + echo "name=Salt Repo for Salt v${ONEDIR_REV_DOT} LTS" >> "${YUM_REPO_FILE}" |
4229 | 4236 | echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}" |
4230 | 4237 | echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}" |
4231 | 4238 | echo "priority=10" >> "${YUM_REPO_FILE}" |
@@ -4297,7 +4304,8 @@ install_centos_stable() { |
4297 | 4304 | MINOR_VER_STRG="" |
4298 | 4305 | elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
4299 | 4306 | # Minor version Salt, need to add specific minor version |
4300 | | - MINOR_VER_STRG="-$STABLE_REV" |
| 4307 | + STABLE_REV_DOT=$(echo "$STABLE_REV" | sed 's/-/\./') |
| 4308 | + MINOR_VER_STRG="-$STABLE_REV_DOT" |
4301 | 4309 | else |
4302 | 4310 | MINOR_VER_STRG="" |
4303 | 4311 | fi |
@@ -4525,7 +4533,8 @@ install_centos_onedir() { |
4525 | 4533 | MINOR_VER_STRG="" |
4526 | 4534 | elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
4527 | 4535 | # Minor version Salt, need to add specific minor version |
4528 | | - MINOR_VER_STRG="-$ONEDIR_REV" |
| 4536 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
| 4537 | + MINOR_VER_STRG="-$ONEDIR_REV_DOT" |
4529 | 4538 | else |
4530 | 4539 | MINOR_VER_STRG="" |
4531 | 4540 | fi |
@@ -5657,9 +5666,10 @@ install_amazon_linux_ami_2_deps() { |
5657 | 5666 | fi |
5658 | 5667 | elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
5659 | 5668 | # using minor version |
5660 | | - echo "[salt-repo-${STABLE_REV}-lts]" > "${YUM_REPO_FILE}" |
| 5669 | + STABLE_REV_DOT=$(echo "$STABLE_REV" | sed 's/-/\./') |
| 5670 | + echo "[salt-repo-${STABLE_REV_DOT}-lts]" > "${YUM_REPO_FILE}" |
5661 | 5671 | # shellcheck disable=SC2129 |
5662 | | - echo "name=Salt Repo for Salt v${STABLE_REV} LTS" >> "${YUM_REPO_FILE}" |
| 5672 | + echo "name=Salt Repo for Salt v${STABLE_REV_DOT} LTS" >> "${YUM_REPO_FILE}" |
5663 | 5673 | echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}" |
5664 | 5674 | echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}" |
5665 | 5675 | echo "priority=10" >> "${YUM_REPO_FILE}" |
@@ -5721,9 +5731,10 @@ install_amazon_linux_ami_2_onedir_deps() { |
5721 | 5731 | fi |
5722 | 5732 | elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
5723 | 5733 | # using minor version |
5724 | | - echo "[salt-repo-${ONEDIR_REV}-lts]" > "${YUM_REPO_FILE}" |
| 5734 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
| 5735 | + echo "[salt-repo-${ONEDIR_REV_DOT}-lts]" > "${YUM_REPO_FILE}" |
5725 | 5736 | # shellcheck disable=SC2129 |
5726 | | - echo "name=Salt Repo for Salt v${ONEDIR_REV} LTS" >> "${YUM_REPO_FILE}" |
| 5737 | + echo "name=Salt Repo for Salt v${ONEDIR_REV_DOT} LTS" >> "${YUM_REPO_FILE}" |
5727 | 5738 | echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}" |
5728 | 5739 | echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}" |
5729 | 5740 | echo "priority=10" >> "${YUM_REPO_FILE}" |
@@ -5873,9 +5884,10 @@ install_amazon_linux_ami_2023_onedir_deps() { |
5873 | 5884 | fi |
5874 | 5885 | elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
5875 | 5886 | # using minor version |
5876 | | - echo "[salt-repo-${ONEDIR_REV}-lts]" > "${YUM_REPO_FILE}" |
| 5887 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
| 5888 | + echo "[salt-repo-${ONEDIR_REV_DOT}-lts]" > "${YUM_REPO_FILE}" |
5877 | 5889 | # shellcheck disable=SC2129 |
5878 | | - echo "name=Salt Repo for Salt v${ONEDIR_REV} LTS" >> "${YUM_REPO_FILE}" |
| 5890 | + echo "name=Salt Repo for Salt v${ONEDIR_REV_DOT} LTS" >> "${YUM_REPO_FILE}" |
5879 | 5891 | echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}" |
5880 | 5892 | echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}" |
5881 | 5893 | echo "priority=10" >> "${YUM_REPO_FILE}" |
@@ -6286,8 +6298,9 @@ __install_saltstack_photon_onedir_repository() { |
6286 | 6298 | fi |
6287 | 6299 | elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
6288 | 6300 | # using minor version |
6289 | | - echo "[salt-repo-${ONEDIR_REV}-lts]" > "${YUM_REPO_FILE}" |
6290 | | - echo "name=Salt Repo for Salt v${ONEDIR_REV} LTS" >> "${YUM_REPO_FILE}" |
| 6301 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
| 6302 | + echo "[salt-repo-${ONEDIR_REV_DOT}-lts]" > "${YUM_REPO_FILE}" |
| 6303 | + echo "name=Salt Repo for Salt v${ONEDIR_REV_DOT} LTS" >> "${YUM_REPO_FILE}" |
6291 | 6304 | echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${YUM_REPO_FILE}" |
6292 | 6305 | echo "skip_if_unavailable=True" >> "${YUM_REPO_FILE}" |
6293 | 6306 | echo "priority=10" >> "${YUM_REPO_FILE}" |
@@ -6582,7 +6595,8 @@ install_photon_onedir() { |
6582 | 6595 | MINOR_VER_STRG="-$_GENERIC_PKG_VERSION" |
6583 | 6596 | elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
6584 | 6597 | # Minor version Salt, need to add specific minor version |
6585 | | - MINOR_VER_STRG="-$STABLE_REV" |
| 6598 | + STABLE_REV_DOT=$(echo "$STABLE_REV" | sed 's/-/\./') |
| 6599 | + MINOR_VER_STRG="-$STABLE_REV_DOT" |
6586 | 6600 | else |
6587 | 6601 | # default to latest version Salt, config and repo already setup |
6588 | 6602 | __get_packagesite_onedir_latest |
@@ -6632,34 +6646,78 @@ install_photon_onedir_post() { |
6632 | 6646 | # |
6633 | 6647 | __ZYPPER_REQUIRES_REPLACE_FILES=-1 |
6634 | 6648 |
|
6635 | | -__set_suse_pkg_repo() { |
6636 | | - |
6637 | | - ## DGM # Set distro repo variable |
6638 | | - ## DGM if [ "${DISTRO_MAJOR_VERSION}" -gt 2015 ]; then |
6639 | | - ## DGM DISTRO_REPO="openSUSE_Tumbleweed" |
6640 | | - ## DGM elif [ "${DISTRO_MAJOR_VERSION}" -eq 15 ] && [ "${DISTRO_MINOR_VERSION}" -ge 4 ]; then |
6641 | | - ## DGM DISTRO_REPO="${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}" |
6642 | | - ## DGM elif [ "${DISTRO_MAJOR_VERSION}" -ge 42 ] || [ "${DISTRO_MAJOR_VERSION}" -eq 15 ]; then |
6643 | | - ## DGM DISTRO_REPO="openSUSE_Leap_${DISTRO_MAJOR_VERSION}.${DISTRO_MINOR_VERSION}" |
6644 | | - ## DGM else |
6645 | | - ## DGM DISTRO_REPO="SLE_${DISTRO_MAJOR_VERSION}_SP${SUSE_PATCHLEVEL}" |
6646 | | - ## DGM fi |
6647 | | - |
6648 | | - ## DGM suse_pkg_url_base="https://download.opensuse.org/repositories/systemsmanagement:/saltstack" |
6649 | | - ## DGM suse_pkg_url_path="${DISTRO_REPO}/systemsmanagement:saltstack.repo" |
6650 | | - ## DGM SUSE_PKG_URL="$suse_pkg_url_base/$suse_pkg_url_path" |
6651 | | - SUSE_PKG_URL="https://github.com/saltstack/salt-install-guide/releases/latest/download/salt.repo" |
6652 | | -} |
6653 | 6649 |
|
6654 | 6650 | __check_and_refresh_suse_pkg_repo() { |
6655 | 6651 | # Check to see if systemsmanagement_saltstack exists |
6656 | | - ## DGM __zypper repos | grep -q systemsmanagement_saltstack |
6657 | 6652 | __zypper repos | grep -q 'salt.repo' |
6658 | 6653 |
|
6659 | 6654 | if [ $? -eq 1 ]; then |
6660 | | - ## DGM # zypper does not yet know anything about systemsmanagement_saltstack |
6661 | 6655 | # zypper does not yet know anything about salt.repo |
6662 | | - __zypper addrepo --refresh "${SUSE_PKG_URL}" || return 1 |
| 6656 | + # zypper does not support exclude similar to Photon, hence have to do following |
| 6657 | + ZYPPER_REPO_FILE="/etc/zypp/repos.d/salt.repo" |
| 6658 | + # shellcheck disable=SC2129 |
| 6659 | + if [ "$ONEDIR_REV" != "latest" ]; then |
| 6660 | + # 3006.x is default, and latest for 3006.x branch |
| 6661 | + if [ "$(echo "$ONEDIR_REV" | grep -E '^(3006|3007)$')" != "" ]; then |
| 6662 | + # latest version for branch 3006 | 3007 |
| 6663 | + REPO_REV_MAJOR=$(echo "$ONEDIR_REV" | cut -d '.' -f 1) |
| 6664 | + if [ "$REPO_REV_MAJOR" -eq "3007" ]; then |
| 6665 | + # Enable the Salt 3007 STS repo |
| 6666 | + echo "[salt-repo-3007-sts]" > "${ZYPPER_REPO_FILE}" |
| 6667 | + echo "name=Salt Repo for Salt v3007 STS" >> "${ZYPPER_REPO_FILE}" |
| 6668 | + echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${ZYPPER_REPO_FILE}" |
| 6669 | + echo "skip_if_unavailable=True" >> "${ZYPPER_REPO_FILE}" |
| 6670 | + echo "priority=10" >> "${ZYPPER_REPO_FILE}" |
| 6671 | + echo "enabled=1" >> "${ZYPPER_REPO_FILE}" |
| 6672 | + echo "enabled_metadata=1" >> "${ZYPPER_REPO_FILE}" |
| 6673 | + echo "exclude=*3006* *3008* *3009* *3010*" >> "${ZYPPER_REPO_FILE}" |
| 6674 | + echo "gpgcheck=1" >> "${ZYPPER_REPO_FILE}" |
| 6675 | + echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${ZYPPER_REPO_FILE}" |
| 6676 | + zypper addlock "salt-* < 3007" && zypper addlock "salt-* >= 3008" |
| 6677 | + else |
| 6678 | + # Salt 3006 repo |
| 6679 | + echo "[salt-repo-3006-lts]" > "${ZYPPER_REPO_FILE}" |
| 6680 | + echo "name=Salt Repo for Salt v3006 LTS" >> "${ZYPPER_REPO_FILE}" |
| 6681 | + echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${ZYPPER_REPO_FILE}" |
| 6682 | + echo "skip_if_unavailable=True" >> "${ZYPPER_REPO_FILE}" |
| 6683 | + echo "priority=10" >> "${ZYPPER_REPO_FILE}" |
| 6684 | + echo "enabled=1" >> "${ZYPPER_REPO_FILE}" |
| 6685 | + echo "enabled_metadata=1" >> "${ZYPPER_REPO_FILE}" |
| 6686 | + echo "exclude=*3007* *3008* *3009* *3010*" >> "${ZYPPER_REPO_FILE}" |
| 6687 | + echo "gpgcheck=1" >> "${ZYPPER_REPO_FILE}" |
| 6688 | + echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${ZYPPER_REPO_FILE}" |
| 6689 | + zypper addlock "salt-* < 3006" && zypper addlock "salt-* >= 3007" |
| 6690 | + fi |
| 6691 | + elif [ "$(echo "$ONEDIR_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
| 6692 | + # using minor version |
| 6693 | + ONEDIR_REV_DOT=$(echo "$ONEDIR_REV" | sed 's/-/\./') |
| 6694 | + echo "[salt-repo-${ONEDIR_REV_DOT}-lts]" > "${ZYPPER_REPO_FILE}" |
| 6695 | + echo "name=Salt Repo for Salt v${ONEDIR_REV_DOT} LTS" >> "${ZYPPER_REPO_FILE}" |
| 6696 | + echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${ZYPPER_REPO_FILE}" |
| 6697 | + echo "skip_if_unavailable=True" >> "${ZYPPER_REPO_FILE}" |
| 6698 | + echo "priority=10" >> "${ZYPPER_REPO_FILE}" |
| 6699 | + echo "enabled=1" >> "${ZYPPER_REPO_FILE}" |
| 6700 | + echo "enabled_metadata=1" >> "${ZYPPER_REPO_FILE}" |
| 6701 | + echo "gpgcheck=1" >> "${ZYPPER_REPO_FILE}" |
| 6702 | + echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${ZYPPER_REPO_FILE}"a |
| 6703 | + ONEDIR_MAJ_VER=$(echo "${ONEDIR_REV_DOT}" | awk -F '.' '{print $1}') |
| 6704 | + # shellcheck disable=SC2004 |
| 6705 | + ONEDIR_MAJ_VER_PLUS=$((${ONEDIR_MAJ_VER} + 1)) |
| 6706 | + zypper addlock "salt-* < ${ONEDIR_MAJ_VER}" && zypper addlock "salt-* >= ${ONEDIR_MAJ_VER_PLUS}" |
| 6707 | + fi |
| 6708 | + else |
| 6709 | + # Enable the Salt LATEST repo |
| 6710 | + echo "[salt-repo-latest]" > "${ZYPPER_REPO_FILE}" |
| 6711 | + echo "name=Salt Repo for Salt LATEST release" >> "${ZYPPER_REPO_FILE}" |
| 6712 | + echo "baseurl=https://${_REPO_URL}/saltproject-rpm/" >> "${ZYPPER_REPO_FILE}" |
| 6713 | + echo "skip_if_unavailable=True" >> "${ZYPPER_REPO_FILE}" |
| 6714 | + echo "priority=10" >> "${ZYPPER_REPO_FILE}" |
| 6715 | + echo "enabled=1" >> "${ZYPPER_REPO_FILE}" |
| 6716 | + echo "enabled_metadata=1" >> "${ZYPPER_REPO_FILE}" |
| 6717 | + echo "gpgcheck=1" >> "${ZYPPER_REPO_FILE}" |
| 6718 | + echo "gpgkey=https://${_REPO_URL}/api/security/keypair/SaltProjectKey/public" >> "${ZYPPER_REPO_FILE}" |
| 6719 | + fi |
| 6720 | + __zypper addrepo --refresh "${ZYPPER_REPO_FILE}" || return 1 |
6663 | 6721 | fi |
6664 | 6722 | } |
6665 | 6723 |
|
@@ -6710,8 +6768,6 @@ __zypper_install() { |
6710 | 6768 | __opensuse_prep_install() { |
6711 | 6769 | # DRY function for common installation preparatory steps for SUSE |
6712 | 6770 | if [ "$_DISABLE_REPOS" -eq $BS_FALSE ]; then |
6713 | | - # Is the repository already known |
6714 | | - __set_suse_pkg_repo |
6715 | 6771 | # Check zypper repos and refresh if necessary |
6716 | 6772 | __check_and_refresh_suse_pkg_repo |
6717 | 6773 | fi |
@@ -6798,7 +6854,8 @@ install_opensuse_stable() { |
6798 | 6854 | MINOR_VER_STRG="" |
6799 | 6855 | elif [ "$(echo "$STABLE_REV" | grep -E '^([3-9][0-5]{2}[6-9](\.[0-9]*)?)')" != "" ]; then |
6800 | 6856 | # Minor version Salt, need to add specific minor version |
6801 | | - MINOR_VER_STRG="-$STABLE_REV" |
| 6857 | + STABLE_REV_DOT=$(echo "$STABLE_REV" | sed 's/-/\./') |
| 6858 | + MINOR_VER_STRG="-$STABLE_REV_DOT" |
6802 | 6859 | else |
6803 | 6860 | MINOR_VER_STRG="" |
6804 | 6861 | fi |
@@ -7113,12 +7170,94 @@ install_suse_15_restart_daemons() { |
7113 | 7170 | return 0 |
7114 | 7171 | } |
7115 | 7172 |
|
| 7173 | +install_suse_15_check_services() { |
| 7174 | + install_opensuse_check_services || return 1 |
| 7175 | + return 0 |
| 7176 | +} |
| 7177 | + |
7116 | 7178 | # |
7117 | 7179 | # End of SUSE Enterprise 15 |
7118 | 7180 | # |
7119 | 7181 | ####################################################################################################################### |
7120 | 7182 |
|
7121 | 7183 |
|
| 7184 | +####################################################################################################################### |
| 7185 | +# |
| 7186 | +# SUSE Enterprise 15, now has ID sled |
| 7187 | +# |
| 7188 | + |
| 7189 | +install_sled_15_stable_deps() { |
| 7190 | + __opensuse_prep_install || return 1 |
| 7191 | + install_opensuse_15_stable_deps || return 1 |
| 7192 | + |
| 7193 | + return 0 |
| 7194 | +} |
| 7195 | + |
| 7196 | +install_sled_15_git_deps() { |
| 7197 | + install_suse_15_stable_deps || return 1 |
| 7198 | + |
| 7199 | + if ! __check_command_exists git; then |
| 7200 | + __zypper_install git-core || return 1 |
| 7201 | + fi |
| 7202 | + |
| 7203 | + install_opensuse_15_git_deps || return 1 |
| 7204 | + |
| 7205 | + return 0 |
| 7206 | +} |
| 7207 | + |
| 7208 | +install_sled_15_onedir_deps() { |
| 7209 | + __opensuse_prep_install || return 1 |
| 7210 | + install_opensuse_15_onedir_deps || return 1 |
| 7211 | + |
| 7212 | + return 0 |
| 7213 | +} |
| 7214 | + |
| 7215 | +install_sled_15_stable() { |
| 7216 | + install_opensuse_stable || return 1 |
| 7217 | + return 0 |
| 7218 | +} |
| 7219 | + |
| 7220 | +install_sled_15_git() { |
| 7221 | + install_opensuse_15_git || return 1 |
| 7222 | + return 0 |
| 7223 | +} |
| 7224 | + |
| 7225 | +install_sled_15_onedir() { |
| 7226 | + install_opensuse_stable || return 1 |
| 7227 | + return 0 |
| 7228 | +} |
| 7229 | + |
| 7230 | +install_sled_15_stable_post() { |
| 7231 | + install_opensuse_stable_post || return 1 |
| 7232 | + return 0 |
| 7233 | +} |
| 7234 | + |
| 7235 | +install_sled_15_git_post() { |
| 7236 | + install_opensuse_git_post || return 1 |
| 7237 | + return 0 |
| 7238 | +} |
| 7239 | + |
| 7240 | +install_sled_15_onedir_post() { |
| 7241 | + install_opensuse_stable_post || return 1 |
| 7242 | + return 0 |
| 7243 | +} |
| 7244 | + |
| 7245 | +install_sled_15_restart_daemons() { |
| 7246 | + install_opensuse_restart_daemons || return 1 |
| 7247 | + return 0 |
| 7248 | +} |
| 7249 | + |
| 7250 | +install_sled_15_check_services() { |
| 7251 | + install_opensuse_check_services || return 1 |
| 7252 | + return 0 |
| 7253 | +} |
| 7254 | + |
| 7255 | +# |
| 7256 | +# End of SUSE Enterprise 15 aka sled |
| 7257 | +# |
| 7258 | +####################################################################################################################### |
| 7259 | + |
| 7260 | + |
7122 | 7261 | ####################################################################################################################### |
7123 | 7262 | # |
7124 | 7263 | # Gentoo Install Functions. |
|
0 commit comments