Rename command-line parameter: -v -> -C

diff --git a/etc/init.d/icinga2.in b/etc/init.d/icinga2.in
index 15054619e47ad631ce38b78f4b2f3c4e685a41cd..f123366fad15842889fd806b20cc84bcebbffe34 100644 (file)
--- a/etc/init.d/icinga2.in
+++ b/etc/init.d/icinga2.in
@@ -45,7 +45,7 @@ start() {
        mkdir -p `dirname -- $ICINGA2_ERROR_LOG`
 
         echo "Validating the configuration file:"
-        if ! $DAEMON -c $ICINGA2_CONFIG_FILE -v; then
+        if ! $DAEMON -c $ICINGA2_CONFIG_FILE -C; then
                 echo "Not starting Icinga 2 due to configuration errors."
                 exit 1
         fi

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 1f64c60de8a8f01c83c2bd6006892816ee36fb09..f8b6662529c89ee33621841d44c01a8c80aeea51 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
                ("library,l", po::value<std::vector<String> >(), "load a library")
                ("include,I", po::value<std::vector<String> >(), "add include search directory")
                ("config,c", po::value<std::vector<String> >(), "parse a configuration file")
-               ("validate,v", "exit after validating the configuration")
+               ("validate,C", "exit after validating the configuration")
                ("debug,x", "enable debugging")
                ("daemonize,d", "detach from the controlling terminal")
                ("errorlog,e", po::value<String>(), "log fatal errors to the specified log file (only works in combination with --daemonize)")