From 43bdf9debe5377216aed0086bff2aad864f6ba82 Mon Sep 17 00:00:00 2001 From: Ɓukasz 'sil2100' Zemczak Date: Mon, 3 Jul 2017 13:44:00 +0200 Subject: Import patches-unapplied version 2.2.14-0ubuntu1 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 4fb0b5a09b26135ade285844da5d7dfe582a8d4c New changelog entries: * New upstream release (LP: #1701350). * debian/copyright: - Refreshed copyright content. --- azurelinuxagent/agent.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'azurelinuxagent/agent.py') diff --git a/azurelinuxagent/agent.py b/azurelinuxagent/agent.py index 90b4253..d1ac354 100644 --- a/azurelinuxagent/agent.py +++ b/azurelinuxagent/agent.py @@ -129,7 +129,7 @@ def main(args=[]): elif command == "help": usage() elif command == "start": - start() + start(conf_file_path=conf_file_path) else: try: agent = Agent(verbose, conf_file_path=conf_file_path) @@ -217,13 +217,16 @@ def usage(): "").format(sys.argv[0]))) print("") -def start(): +def start(conf_file_path=None): """ Start agent daemon in a background process and set stdout/stderr to /dev/null """ devnull = open(os.devnull, 'w') - subprocess.Popen([sys.argv[0], '-daemon'], stdout=devnull, stderr=devnull) + args = [sys.argv[0], '-daemon'] + if conf_file_path is not None: + args.append('-configuration-path:{0}'.format(conf_file_path)) + subprocess.Popen(args, stdout=devnull, stderr=devnull) if __name__ == '__main__' : main() -- cgit v1.2.3