valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22664 from rallytime/bp-22635

Browse Source 
Backport #22635 to 2015.2
This commit is contained in:
Thomas S Hatch 2015-04-14 14:07:21 -06:00
commit 9c7a8a8145
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/syspaths.py
View File

@ -74,6 +74,8 @@ if CONFIG_DIR is None:
CONFIG_DIR = os.path.join(ROOT_DIR, 'usr', 'local', 'etc', 'salt') CONFIG_DIR = os.path.join(ROOT_DIR, 'usr', 'local', 'etc', 'salt')
elif 'netbsd' in __PLATFORM: elif 'netbsd' in __PLATFORM:
CONFIG_DIR = os.path.join(ROOT_DIR, 'usr', 'pkg', 'etc', 'salt') CONFIG_DIR = os.path.join(ROOT_DIR, 'usr', 'pkg', 'etc', 'salt')
elif 'sunos5' in __PLATFORM:
CONFIG_DIR = os.path.join(ROOT_DIR, 'opt', 'local', 'etc', 'salt')
else: else:
CONFIG_DIR = os.path.join(ROOT_DIR, 'etc', 'salt') CONFIG_DIR = os.path.join(ROOT_DIR, 'etc', 'salt')