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

Allow ubuntu systems still in SysV to check for services.

Browse source
This commit is contained in:
Pedro Algarvio 2014-03-10 11:49:39 +00:00
parent 3f2c685834
commit 800657e965
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap-salt.sh
View file

@ -1628,16 +1628,16 @@ install_ubuntu_restart_daemons() {
}
install_ubuntu_check_services() {
if [ ! -f /sbin/initctl ]; then
return 0
fi
for fname in minion master syndic; do
# Skip if not meant to be installed
[ $fname = "minion" ] && [ $_INSTALL_MINION -eq $BS_FALSE ] && continue
[ $fname = "master" ] && [ $_INSTALL_MASTER -eq $BS_FALSE ] && continue
[ $fname = "syndic" ] && [ $_INSTALL_SYNDIC -eq $BS_FALSE ] && continue
__check_services_upstart salt-$fname || return 1
if [ -f /sbin/initctl ] && [ -f /etc/init/salt-$fname ]; then
__check_services_upstart salt-$fname || return 1
elif [ -f /etc/init.d/salt-$fname ]; then
__check_services_sysvinit salt-$fname || return 1
fi
done
return 0
}