salt: update to 2016.11.2.

This commit is contained in:
Toyam Cox 2017-01-30 18:44:24 -05:00
parent 248e680e75
commit 12249cdad6
2 changed files with 2 additions and 24 deletions

View file

@ -1,22 +0,0 @@
fix runit support as init grain.
See https://github.com/saltstack/salt/pull/38326
--- salt/grains/core.py
+++ salt/grains/core.py
@@ -1256,7 +1256,7 @@ def os_data():
init_cmdline = fhr.read().replace('\x00', ' ').split()
init_bin = salt.utils.which(init_cmdline[0])
if init_bin is not None and init_bin.endswith('bin/init'):
- supported_inits = (six.b('upstart'), six.b('sysvinit'), six.b('systemd'), six.b('runit'))
+ supported_inits = (six.b('upstart'), six.b('sysvinit'), six.b('systemd'))
edge_len = max(len(x) for x in supported_inits) - 1
try:
buf_size = __opts__['file_buffer_size']
@@ -1286,6 +1286,8 @@ def os_data():
)
elif salt.utils.which('supervisord') in init_cmdline:
grains['init'] = 'supervisord'
+ elif init_cmdline == ['runit']:
+ grains['init'] = 'runit'
else:
log.info(
'Could not determine init system from command line: ({0})'

View file

@ -1,6 +1,6 @@
# Template file for 'salt'
pkgname=salt
version=2016.11.1
version=2016.11.2
revision=1
build_style=python2-module
noarch=yes
@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@gmail.com>"
license="Apache-2.0"
homepage="http://saltstack.org/"
distfiles="$PYPI_SITE/s/salt/salt-${version}.tar.gz"
checksum=00343e190dcf6dfa27dbec996d1161f7aef16cf99510b67970136cf24f092992
checksum=f5c3d3cf4293d5b80a93790c76dec61421991c9c54222abd7327b3437ad13a43
post_install() {
vmkdir /etc/salt 0750