saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ensure symbolic links are created before using systemctl

Browse source
This commit is contained in:
David Murphy 2024-03-26 15:53:58 -06:00 • committed by Pedro Algarvio
parent 61df4d8c86
commit 93dadb2116
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkg/rpm/salt.spec
View file

@ -176,7 +176,7 @@ cd $RPM_BUILD_DIR
# Fix any hardcoded paths to the relenv python binary on any of the scripts installed in
# the <onedir>/bin directory
find $RPM_BUILD_DIR/build/salt/bin/ -type f -exec sed -i 's:#!/\(.*\)salt/bin/python3:#!/bin/sh -x\n"exec" "$(dirname $(readlink -f $0))/python3" "$0" "$@":g' {} \;
find $RPM_BUILD_DIR/build/salt/bin/ -type f -exec sed -i 's:#!/\(.*\)salt/bin/python3:#!/bin/sh\n"exec" "$(dirname $(readlink -f $0))/python3" "$0" "$@":g' {} \;
$RPM_BUILD_DIR/build/venv/bin/tools pkg build salt-onedir . --package-name $RPM_BUILD_DIR/build/salt --platform linux
$RPM_BUILD_DIR/build/venv/bin/tools pkg pre-archive-cleanup --pkg $RPM_BUILD_DIR/build/salt
@ -472,14 +472,6 @@ ln -s -f /opt/saltstack/salt/salt-cloud %{_bindir}/salt-cloud
%post master
# %%systemd_post salt-master.service
if [ $1 -gt 1 ] ; then
# Upgrade
/bin/systemctl try-restart salt-master.service >/dev/null 2>&1 || :
else
# Initial installation
/bin/systemctl preset salt-master.service >/dev/null 2>&1 || :
fi
ln -s -f /opt/saltstack/salt/salt %{_bindir}/salt
ln -s -f /opt/saltstack/salt/salt-cp %{_bindir}/salt-cp
ln -s -f /opt/saltstack/salt/salt-key %{_bindir}/salt-key
@ -498,8 +490,17 @@ if [ $1 -lt 2 ]; then
fi
fi
fi
# %%systemd_post salt-master.service
if [ $1 -gt 1 ] ; then
# Upgrade
/bin/systemctl try-restart salt-master.service >/dev/null 2>&1 || :
else
# Initial installation
/bin/systemctl preset salt-master.service >/dev/null 2>&1 || :
fi
%post syndic
ln -s -f /opt/saltstack/salt/salt-syndic %{_bindir}/salt-syndic
# %%systemd_post salt-syndic.service
if [ $1 -gt 1 ] ; then
# Upgrade
@ -508,17 +509,8 @@ else
# Initial installation
/bin/systemctl preset salt-syndic.service >/dev/null 2>&1 || :
fi
ln -s -f /opt/saltstack/salt/salt-syndic %{_bindir}/salt-syndic
%post minion
# %%systemd_post salt-minion.service
if [ $1 -gt 1 ] ; then
# Upgrade
/bin/systemctl try-restart salt-minion.service >/dev/null 2>&1 || :
else
# Initial installation
/bin/systemctl preset salt-minion.service >/dev/null 2>&1 || :
fi
ln -s -f /opt/saltstack/salt/salt-minion %{_bindir}/salt-minion
ln -s -f /opt/saltstack/salt/salt-call %{_bindir}/salt-call
ln -s -f /opt/saltstack/salt/salt-proxy %{_bindir}/salt-proxy
@ -535,11 +527,20 @@ if [ $1 -lt 2 ]; then
fi
fi
fi
# %%systemd_post salt-minion.service
if [ $1 -gt 1 ] ; then
# Upgrade
/bin/systemctl try-restart salt-minion.service >/dev/null 2>&1 || :
else
# Initial installation
/bin/systemctl preset salt-minion.service >/dev/null 2>&1 || :
fi
%post ssh
ln -s -f /opt/saltstack/salt/salt-ssh %{_bindir}/salt-ssh
%post api
ln -s -f /opt/saltstack/salt/salt-api %{_bindir}/salt-api
# %%systemd_post salt-api.service
if [ $1 -gt 1 ] ; then
# Upgrade
@ -548,7 +549,6 @@ else
# Initial installation
/bin/systemctl preset salt-api.service >/dev/null 2>&1 || :
fi
ln -s -f /opt/saltstack/salt/salt-api %{_bindir}/salt-api
%posttrans cloud