From a79bffeb2021dcd28b2c67e8b397c0e91074413e Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Tue, 9 Jul 2024 09:41:21 -0600
Subject: [PATCH] Added tornado for Photon 4 git, and systemd for Photon 5

---
 bootstrap-salt.sh | 8 +++-----
 kitchen.yml       | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index dd55f36..37120da 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -6593,13 +6593,11 @@ install_photon_git_deps() {
     ## DGM __PACKAGES="python${PY_PKG_VER}-devel python${PY_PKG_VER}-pip python${PY_PKG_VER}-setuptools gcc glibc-devel linux-devel.x86_64"
     __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}"
 
-    ## DGM tornado appears to be missing in 3006.x pkg requirements
-    ## DGM __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado"
 
     ## DGM Photon 5 container is missing systemd on default installation
-    if [ "${DISTRO_MAJOR_VERSION}" -ge 5  ]; then
-        # Photon 5 container is missing systemd on default installation
-        __PACKAGES="${__PACKAGES} systemd"
+    if [ "${DISTRO_MAJOR_VERSION}" -lt 5  ]; then
+        ## DGM tornado appears to be missing in 3006.x pkg requirements
+        __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-tornado"
     fi
 
     # shellcheck disable=SC2086
diff --git a/kitchen.yml b/kitchen.yml
index ee6c8eb..4172435 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -148,7 +148,7 @@ platforms:
     driver:
       image: photon:5.0
       provision_command:
-        - tdnf -y install rpm procps-ng coreutils gawk
+        - tdnf -y install rpm procps-ng coreutils gawk systemd
         - echo "PubkeyAcceptedKeyTypes +ssh-rsa" | tee -a /etc/ssh/sshd_config
         - sed -ie 's/PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config
         - systemctl enable sshd.service