From 662d36fd165abd6e515da457eb0c75c773d9c021 Mon Sep 17 00:00:00 2001 From: Michael Insel Date: Thu, 3 May 2018 17:12:06 +0200 Subject: [PATCH] Warn in case of failed conf.d exclusion also on master setup refs #4508 --- lib/cli/nodewizardcommand.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp index f729685f6..3398aaa85 100644 --- a/lib/cli/nodewizardcommand.cpp +++ b/lib/cli/nodewizardcommand.cpp @@ -633,7 +633,7 @@ wizard_global_zone_loop_start: if(!NodeUtility::UpdateConfiguration("\"conf.d\"", false, true)) { std::cout << ConsoleColorTag(Console_Bold | Console_ForegroundRed) - << "Failed to disable conf.d inclusion, it may already be disabled." + << "Failed to disable conf.d inclusion, it may already be disabled.\n" << ConsoleColorTag(Console_Normal); } @@ -840,7 +840,11 @@ wizard_global_zone_loop_start: << "Disable the inclusion of the conf.d directory...\n" << ConsoleColorTag(Console_Normal); - NodeUtility::UpdateConfiguration("\"conf.d\"", false, true); + if (!NodeUtility::UpdateConfiguration("\"conf.d\"", false, true)) { + std::cout << ConsoleColorTag(Console_Bold | Console_ForegroundRed) + << "Failed to disable conf.d inclusion, it may already be disabled.\n" + << ConsoleColorTag(Console_Normal); + } /* Include api-users.conf */ String apiUsersFilePath = Application::GetSysconfDir() + "/icinga2/conf.d/api-users.conf";