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 #28255 from cachedout/cli_opt

Browse source 
Add __cli opt
This commit is contained in:
Mike Place 2015-10-23 12:44:30 -06:00
commit 909fa3dc97
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/config.py
View file

@ -1979,6 +1979,8 @@ def apply_minion_config(overrides=None,
if overrides:
opts.update(overrides)
opts['__cli'] = os.path.basename(sys.argv[0])
if len(opts['sock_dir']) > len(opts['cachedir']) + 10:
opts['sock_dir'] = os.path.join(opts['cachedir'], '.salt-unix')