saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24535 from rallytime/bp-24518

Browse source 
Back-port #24518 to 2015.5
This commit is contained in:
Thomas S Hatch 2015-06-09 14:06:18 -06:00
commit dbd49b4acb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/kmod.py
View file

@ -52,7 +52,7 @@ def _get_modules_conf():
Return location of modules config file.
Default: /etc/modules
'''
if __grains__['os'] == 'Arch':
if 'systemd' in __grains__:
return '/etc/modules-load.d/salt_managed.conf'
return '/etc/modules'