chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: use quoted word parsing where applicable
[elogind.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index a2dc1bc12f707fb69581b28cfee99c8ba99d2b58..d5902b354fbc2e90be133ee39293832fef229ffe 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-426,7
+426,7
@@
static int config_parse_cpu_affinity(
assert(lvalue);
assert(rvalue);
assert(lvalue);
assert(rvalue);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD
_QUOTED
(w, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
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_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;
if (getpid() == 1) {
arg_running_as = MANAGER_SYSTEM;
@@
-929,10
+929,11
@@
int main(int argc, char *argv[]) {
if (getpid() == 1)
install_crash_handler();
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) {
if (arg_running_as == MANAGER_SYSTEM && !serialization) {
- status_welcome();
+ if (arg_show_status)
+ status_welcome();
modprobe_setup(arg_nomodules);
kmod_setup();
hostname_setup();
modprobe_setup(arg_nomodules);
kmod_setup();
hostname_setup();
@@
-1006,6
+1007,7
@@
int main(int argc, char *argv[]) {
goto finish;
case MANAGER_RELOAD:
goto finish;
case MANAGER_RELOAD:
+ log_info("Reloading.");
if ((r = manager_reload(m)) < 0)
log_error("Failed to reload: %s", strerror(-r));
break;
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;
goto finish;
reexecute = true;
- log_
debug
("Reexecuting.");
+ log_
notice
("Reexecuting.");
goto finish;
default:
goto finish;
default: