mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Do not change the systemd files for Fedora 36+
This commit is contained in:
parent
db9d0e5f05
commit
e458a9c475
2 changed files with 5 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue