mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Merge pull request #20042 from jodv/fix-relpath-daemonized-minion
Allow relative paths for --config-dir with daemonized minions
This commit is contained in:
commit
d64c2258f6
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user