]> granicus.if.org Git - icinga2/commitdiff
Don't inherit daemonize parameter from parent process 6546/head
authorMichael Friedrich <michael.friedrich@icinga.com>
Thu, 27 Sep 2018 18:30:19 +0000 (20:30 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Thu, 27 Sep 2018 18:30:19 +0000 (20:30 +0200)
lib/remote/configpackageutility.cpp

index 87c6764eed3ee17ca1cd6f6506c07cb6830e39a1..6071854913fad43798e515f855aea8721364916f 100644 (file)
@@ -220,9 +220,15 @@ void ConfigPackageUtility::AsyncTryActivateStage(const String& packageName, cons
        });
 
        // copy all arguments of parent process
-       for (int i=1; i < Application::GetArgC(); i++) {
-               args->Add(Application::GetArgV()[i]);
+       for (int i = 1; i < Application::GetArgC(); i++) {
+               String argV = Application::GetArgV()[i];
+
+               if (argV == "-d" || argV == "--daemonize")
+                       continue;
+
+               args->Add(argV);
        }
+
        // add arguments for validation
        args->Add("--validate");
        args->Add("--define");