cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sysctl state.

Browse Source 
OK kn, jasper
This commit is contained in:
florian 2020-07-09 08:15:12 +00:00
parent 8c8c9721b1
commit 170605c53d
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/salt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.147 2020/07/06 17:17:13 jasper Exp $
# $OpenBSD: Makefile,v 1.148 2020/07/09 08:15:12 florian Exp $
# optional dependencies
# https://github.com/saltstack/salt/blob/develop/doc/conf.py
@ -19,7 +19,7 @@ COMMENT = remote execution and configuration management system
MODPY_EGG_VERSION = 3001
DISTNAME = salt-${MODPY_EGG_VERSION}
REVISION = 2
REVISION = 3
CATEGORIES = sysutils net devel

20
sysutils/salt/patches/patch-salt_states_sysctl_py Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-salt_states_sysctl_py,v 1.1 2020/07/09 08:15:13 florian Exp $
"Only run sysctl ignore when configured"
https://github.com/saltstack/salt/pull/57841
Index: salt/states/sysctl.py
--- salt/states/sysctl.py.orig
+++ salt/states/sysctl.py
@@ -114,7 +114,11 @@ def present(name, value, config=None, ignore=False):
return ret
try:
- update = __salt__["sysctl.persist"](name, value, config, ignore)
+ if ignore:
+ # ignore is a linux only sysctl setting
+ update = __salt__["sysctl.persist"](name, value, config, ignore)
+ else:
+ update = __salt__["sysctl.persist"](name, value, config)
except CommandExecutionError as exc:
ret["result"] = False
ret["comment"] = "Failed to set {0} to {1}: {2}".format(name, value, exc)