Merge pull request #20042 from jodv/fix-relpath-daemonized-minion

Allow relative paths for --config-dir with daemonized minions
This commit is contained in:
Thomas S Hatch 2015-01-26 15:30:50 -07:00
commit d64c2258f6

View File

@ -115,15 +115,6 @@ def salt_minion():
minion.start()
return
if '-d' in sys.argv or '--daemon' in sys.argv:
# disable daemonize on sub processes
if '-d' in sys.argv:
sys.argv.remove('-d')
if '--daemon' in sys.argv:
sys.argv.remove('--daemon')
# daemonize current process
salt.utils.daemonize()
# keep one minion subprocess running
while True:
try: