Warn in case of failed conf.d exclusion also on master setup

refs #4508

diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index f729685f61f70ff4b43dfbc43063deea129e747a..3398aaa8568cda9cd34a67e5d0fb38949cf4137b 100644 (file)
--- 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";