Do not change the systemd files for Fedora 36+

This commit is contained in:
Gareth J. Greenaway 2022-12-05 12:48:23 -08:00 committed by Pedro Algarvio
parent db9d0e5f05
commit e458a9c475
2 changed files with 5 additions and 3 deletions

View file

@ -4315,9 +4315,9 @@ install_fedora_git_post() {
__copyfile "${_SALT_GIT_CHECKOUT_DIR}/pkg/rpm/salt-${fname}.service" "/lib/systemd/system/salt-${fname}.service"
# Salt executables are located under `/usr/local/bin/` on Fedora 36+
if [ "${DISTRO_VERSION}" -ge 36 ]; then
sed -i -e 's:/usr/bin/:/usr/local/bin/:g' /lib/systemd/system/salt-*.service
fi
#if [ "${DISTRO_VERSION}" -ge 36 ]; then
# sed -i -e 's:/usr/bin/:/usr/local/bin/:g' /lib/systemd/system/salt-*.service
#fi
# Skip salt-api since the service should be opt-in and not necessarily started on boot
[ $fname = "api" ] && continue

View file

@ -72,6 +72,7 @@ platforms:
provision_command:
- rc-update add sshd default
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
- touch /etc/sudoers.d/root
- name: gentoo-systemd
driver:
image: gentoo/stage3:systemd
@ -79,6 +80,7 @@ platforms:
provision_command:
- systemctl enable sshd.service
- echo "PubkeyAcceptedAlgorithms +ssh-rsa" | tee -a /etc/ssh/sshd_config
- touch /etc/sudoers.d/root
- name: opensuse-15
driver:
image: opensuse/leap:15.4