pool/salt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 243968 from devel:languages:python

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/243968
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/salt?expand=0&rev=35
This commit is contained in:
Ludwig Nussel 2014-08-11 08:07:17 +00:00 committed by Git OBS Bridge
parent 33d84a8607
commit fa42f45329
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
disable-service-py-for-suse-family.patch Normal file
View File

@ -0,0 +1,26 @@
From 372d68180c35213de57b0b0b5a4773ffa92a4e5e Mon Sep 17 00:00:00 2001
From: Tim Serong <tserong@suse.com>
Date: Wed, 6 Aug 2014 16:33:07 +1000
Subject: [PATCH] Disable service.py for entire SUSE family >= 12
Checking os_family allows us to pick up openSUSE and SUSE Linux Enterprise, rather than just checking for os == openSUSE.
---
salt/modules/service.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/salt/modules/service.py b/salt/modules/service.py
index cfafe24..d581916 100644
--- a/salt/modules/service.py
+++ b/salt/modules/service.py
@@ -47,7 +47,7 @@ def __virtual__():
if __grains__['kernel'] != 'Linux':
return False
# Suse >=12.0 uses systemd
- if __grains__.get('os', '') == 'openSUSE':
+ if __grains__.get('os_family', '') == 'Suse':
try:
if int(__grains__.get('osrelease', '').split('.')[0]) >= 12:
return False
--
2.0.3

6
salt.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 6 06:36:02 UTC 2014 - tserong@suse.com
- Ensure salt uses systemd for services on SLES
+ Added disable-service-py-for-suse-family.patch
-------------------------------------------------------------------
Mon Aug 4 16:12:14 UTC 2014 - aboe76@gmail.com

3
salt.spec
View File

@ -32,6 +32,8 @@ Patch2: allow-systemd-parameterized-services.patch
Patch3: pass-all-systemd-list-units.patch
# PATCH-FIX-OPENSUSE use-forking-daemon.patch tserong@suse.com -- We don't have python-systemd, so notify can't work
Patch4: use-forking-daemon.patch
# PATCH-FIX-UPSTREAM disable-service-py-for-suse-family.patch tserong@suse.com -- ensure salt uses systemd for services on SLES
Patch5: disable-service-py-for-suse-family.patch
#for building
BuildRequires: fdupes
@ -234,6 +236,7 @@ Bash command line completion support for %{name}.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
python setup.py build