main: log to the journal in container mode, by default

diff --git a/TODO b/TODO
index efe76f31f1d911d7ea0f8ef24659670e57335111..19ca60304eaa66f8d54ba4b633f99782636ca632 100644 (file)
--- a/TODO
+++ b/TODO
@@ -24,6 +24,10 @@ Features:
 
 * selinux: merge systemd selinux access controls (dwalsh)
 
 
 * selinux: merge systemd selinux access controls (dwalsh)
 

+* ConditionSecurity= should learn about IMA
+
+* add RequiredBy to [Install]
+

 * cg_shorten_controllers() misuses alloca()
 
 * suspend/hibernate/hybrid support, auto-suspend logic with idle hint
 * cg_shorten_controllers() misuses alloca()
 
 * suspend/hibernate/hybrid support, auto-suspend logic with idle hint


@@ -153,8 +157,6 @@ Features:
 
 * support "systemctl stop foobar@.service" to stop all units matching a certain template
 
 
 * support "systemctl stop foobar@.service" to stop all units matching a certain template
 

-* move to LGPL2+
-

 * logind: allow showing logout dialog from system
 
 * document that %% can be used to write % in a string that is specifier extended
 * logind: allow showing logout dialog from system
 
 * document that %% can be used to write % in a string that is specifier extended

diff --git a/src/core/main.c b/src/core/main.c
index e3ea868da8cddaf59ce255adf1d0c3c97638bfd9..290de26022fc237c2e52a38e3a8ae6721054e9c9 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1211,7 +1211,7 @@ int main(int argc, char *argv[]) {
 
         if (getpid() == 1) {
                 arg_running_as = MANAGER_SYSTEM;
 
         if (getpid() == 1) {
                 arg_running_as = MANAGER_SYSTEM;

-                log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_JOURNAL_OR_KMSG);
+                log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_JOURNAL : LOG_TARGET_JOURNAL_OR_KMSG);

 
                 if (!is_reexec) {
                         if (selinux_setup(&loaded_policy) < 0)
 
                 if (!is_reexec) {
                         if (selinux_setup(&loaded_policy) < 0)