chiark / gitweb /
util: use quoted word parsing where applicable
[elogind.git] / src / main.c
index a2dc1bc12f707fb69581b28cfee99c8ba99d2b58..d5902b354fbc2e90be133ee39293832fef229ffe 100644 (file)
@@ -426,7 +426,7 @@ static int config_parse_cpu_affinity(
         assert(lvalue);
         assert(rvalue);
 
-        FOREACH_WORD(w, l, rvalue, state) {
+        FOREACH_WORD_QUOTED(w, l, rvalue, state) {
                 char *t;
                 int r;
                 unsigned cpu;
@@ -833,7 +833,7 @@ int main(int argc, char *argv[]) {
 
         log_show_color(true);
         log_show_location(false);
-        log_set_max_level(LOG_DEBUG);
+        log_set_max_level(LOG_INFO);
 
         if (getpid() == 1) {
                 arg_running_as = MANAGER_SYSTEM;
@@ -929,10 +929,11 @@ int main(int argc, char *argv[]) {
         if (getpid() == 1)
                 install_crash_handler();
 
-        log_debug(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as));
+        log_info(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as));
 
         if (arg_running_as == MANAGER_SYSTEM && !serialization) {
-                status_welcome();
+                if (arg_show_status)
+                        status_welcome();
                 modprobe_setup(arg_nomodules);
                 kmod_setup();
                 hostname_setup();
@@ -1006,6 +1007,7 @@ int main(int argc, char *argv[]) {
                         goto finish;
 
                 case MANAGER_RELOAD:
+                        log_info("Reloading.");
                         if ((r = manager_reload(m)) < 0)
                                 log_error("Failed to reload: %s", strerror(-r));
                         break;
@@ -1015,7 +1017,7 @@ int main(int argc, char *argv[]) {
                                 goto finish;
 
                         reexecute = true;
-                        log_debug("Reexecuting.");
+                        log_notice("Reexecuting.");
                         goto finish;
 
                 default: