chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a76266
)
main: don't open console in --test mode
author
Lennart Poettering
<lennart@poettering.net>
Fri, 23 Apr 2010 21:26:19 +0000
(23:26 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 23 Apr 2010 21:26:19 +0000
(23:26 +0200)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 5b23c937b7386e69db20551c3942574d6b248c93..d2721fd0996ea975a17b4a4d328fecedd21263eb 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-615,7
+615,7
@@
int main(int argc, char *argv[]) {
/* Reset the console, but only if this is really init and we
* are freshly booted */
/* Reset the console, but only if this is really init and we
* are freshly booted */
- if (running_as == MANAGER_INIT)
+ if (running_as == MANAGER_INIT
&& action == ACTION_RUN
)
console_setup(getpid() == 1 && !serialization);
/* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */
console_setup(getpid() == 1 && !serialization);
/* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */