diff options
Diffstat (limited to 'sysutils/salt/patches')
-rw-r--r-- | sysutils/salt/patches/patch-salt_modules_cron.py | 16 | ||||
-rw-r--r-- | sysutils/salt/patches/patch-salt_modules_status.py | 15 |
2 files changed, 31 insertions, 0 deletions
diff --git a/sysutils/salt/patches/patch-salt_modules_cron.py b/sysutils/salt/patches/patch-salt_modules_cron.py new file mode 100644 index 00000000000..972dcd0dc72 --- /dev/null +++ b/sysutils/salt/patches/patch-salt_modules_cron.py @@ -0,0 +1,16 @@ +$NetBSD: patch-salt_modules_cron.py,v 1.1.2.2 2016/02/20 21:24:10 spz Exp $ + +Fix for cron on Solaris. +https://github.com/saltstack/salt/pull/29777 + +--- salt/modules/cron.py.orig 2016-02-01 19:40:31.000000000 +0000 ++++ salt/modules/cron.py +@@ -155,7 +155,7 @@ def _get_cron_cmdstr(path, user=None): + ''' + cmd = 'crontab' + +- if user: ++ if user and __grains__.get('os_family') not in ('Solaris', 'AIX'): + cmd += ' -u {0}'.format(user) + + return '{0} {1}'.format(cmd, path) diff --git a/sysutils/salt/patches/patch-salt_modules_status.py b/sysutils/salt/patches/patch-salt_modules_status.py new file mode 100644 index 00000000000..34bc3d26b3f --- /dev/null +++ b/sysutils/salt/patches/patch-salt_modules_status.py @@ -0,0 +1,15 @@ +$NetBSD: patch-salt_modules_status.py,v 1.2.2.2 2016/02/20 21:24:10 spz Exp $ + +Avoid a crash in "status.diskusage" when not on Linux or FreeBSD + +--- salt/modules/status.py.orig 2016-02-04 21:56:06.000000000 +0000 ++++ salt/modules/status.py +@@ -443,6 +443,8 @@ def diskusage(*args): + ifile = salt.utils.fopen(procf, 'r').readlines() + elif __grains__['kernel'] == 'FreeBSD': + ifile = __salt__['cmd.run']('mount -p').splitlines() ++ else: ++ ifile = [] + + for line in ifile: + comps = line.split() |