Skip to content

fixes for Photon4/5 #2080

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

Merged
twangboy merged 2 commits into from
Sep 2, 2025
Merged

fixes for Photon4/5 #2080

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12f001f
use system name as reported by Photon 4/5
erwindon Jul 30, 2025
e8b1b4b
install wget as dependency for Photon 4/5
erwindon Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6295,8 +6295,8 @@ __get_packagesite_onedir_latest() {
}


__install_saltstack_photon_onedir_repository() {
echodebug "__install_saltstack_photon_onedir_repository() entry"
__install_saltstack_vmware_photon_os_onedir_repository() {
echodebug "__install_saltstack_vmware_photon_os_onedir_repository() entry"

if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then
echoerror "Python version is no longer supported, only Python 3"
Expand Down Expand Up @@ -6376,8 +6376,8 @@ __install_saltstack_photon_onedir_repository() {
return 0
}

install_photon_deps() {
echodebug "install_photon_deps() entry"
install_vmware_photon_os_deps() {
echodebug "install_vmware_photon_os_deps() entry"

if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then
echoerror "Python version is no longer supported, only Python 3"
Expand Down Expand Up @@ -6406,8 +6406,8 @@ install_photon_deps() {
return 0
}

install_photon_stable_post() {
echodebug "install_photon_stable_post() entry"
install_vmware_photon_os_stable_post() {
echodebug "install_vmware_photon_os_stable_post() entry"

for fname in api master minion syndic; do
# Skip salt-api since the service should be opt-in and not necessarily started on boot
Expand All @@ -6424,8 +6424,8 @@ install_photon_stable_post() {
done
}

install_photon_git_deps() {
echodebug "install_photon_git_deps() entry"
install_vmware_photon_os_git_deps() {
echodebug "install_vmware_photon_os_git_deps() entry"

if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -ne 3 ]; then
echoerror "Python version is no longer supported, only Python 3"
Expand Down Expand Up @@ -6463,7 +6463,7 @@ install_photon_git_deps() {

__PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc glibc-devel linux-devel.x86_64 cython${PY_PKG_VER}"

echodebug "install_photon_git_deps() distro major version, ${DISTRO_MAJOR_VERSION}"
echodebug "install_vmware_photon_os_git_deps() distro major version, ${DISTRO_MAJOR_VERSION}"

## Photon 5 container is missing systemd on default installation
if [ "${DISTRO_MAJOR_VERSION}" -lt 5 ]; then
Expand All @@ -6489,8 +6489,8 @@ install_photon_git_deps() {
return 0
}

install_photon_git() {
echodebug "install_photon_git() entry"
install_vmware_photon_os_git() {
echodebug "install_vmware_photon_os_git() entry"

if [ "${_PY_EXE}" != "" ]; then
_PYEXE=${_PY_EXE}
Expand All @@ -6500,7 +6500,7 @@ install_photon_git() {
return 1
fi

install_photon_git_deps
install_vmware_photon_os_git_deps

if [ -f "${_SALT_GIT_CHECKOUT_DIR}/salt/syspaths.py" ]; then
${_PYEXE} setup.py --salt-config-dir="$_SALT_ETC_DIR" --salt-cache-dir="${_SALT_CACHE_DIR}" ${SETUP_PY_INSTALL_ARGS} install --prefix=/usr || return 1
Expand All @@ -6510,8 +6510,8 @@ install_photon_git() {
return 0
}

install_photon_git_post() {
echodebug "install_photon_git_post() entry"
install_vmware_photon_os_git_post() {
echodebug "install_vmware_photon_os_git_post() entry"

for fname in api master minion syndic; do
# Skip if not meant to be installed
Expand Down Expand Up @@ -6543,9 +6543,9 @@ install_photon_git_post() {
done
}

install_photon_restart_daemons() {
install_vmware_photon_os_restart_daemons() {
[ "$_START_DAEMONS" -eq $BS_FALSE ] && return
echodebug "install_photon_restart_daemons() entry"
echodebug "install_vmware_photon_os_restart_daemons() entry"


for fname in api master minion syndic; do
Expand All @@ -6567,8 +6567,8 @@ install_photon_restart_daemons() {
done
}

install_photon_check_services() {
echodebug "install_photon_check_services() entry"
install_vmware_photon_os_check_services() {
echodebug "install_vmware_photon_os_check_services() entry"

for fname in api master minion syndic; do
# Skip salt-api since the service should be opt-in and not necessarily started on boot
Expand All @@ -6585,8 +6585,8 @@ install_photon_check_services() {
return 0
}

install_photon_onedir_deps() {
echodebug "install_photon_onedir_deps() entry"
install_vmware_photon_os_onedir_deps() {
echodebug "install_vmware_photon_os_onedir_deps() entry"


if [ "$_UPGRADE_SYS" -eq $BS_TRUE ]; then
Expand All @@ -6600,17 +6600,17 @@ install_photon_onedir_deps() {
fi

if [ "$_DISABLE_REPOS" -eq "$BS_FALSE" ]; then
__install_saltstack_photon_onedir_repository || return 1
__install_saltstack_vmware_photon_os_onedir_repository || return 1
fi

# If -R was passed, we need to configure custom repo url with rsync-ed packages
# Which was handled in __install_saltstack_rhel_repository buu that hanlded old-stable which is for
# releases which are End-Of-Life. This call has its own check in case -r was passed without -R.
if [ "$_CUSTOM_REPO_URL" != "null" ]; then
__install_saltstack_photon_onedir_repository || return 1
__install_saltstack_vmware_photon_os_onedir_repository || return 1
fi

__PACKAGES="procps-ng sudo shadow"
__PACKAGES="procps-ng sudo shadow wget"

# shellcheck disable=SC2086
__tdnf_install_noinput ${__PACKAGES} || return 1
Expand All @@ -6626,9 +6626,9 @@ install_photon_onedir_deps() {
}


install_photon_onedir() {
install_vmware_photon_os_onedir() {

echodebug "install_photon_onedir() entry"
echodebug "install_vmware_photon_os_onedir() entry"

STABLE_REV=$ONEDIR_REV
_GENERIC_PKG_VERSION=""
Expand Down Expand Up @@ -6672,9 +6672,9 @@ install_photon_onedir() {
return 0
}

install_photon_onedir_post() {
install_vmware_photon_os_onedir_post() {
STABLE_REV=$ONEDIR_REV
install_photon_stable_post || return 1
install_vmware_photon_os_stable_post || return 1

return 0
}
Expand Down
Loading