[systemd-commits] 3 commits - src/core src/shared TODO

[Lennart Poettering]

 TODO                   |    6 ++++--
 src/core/main.c        |    2 +-
 src/core/mount-setup.c |    2 +-
 src/shared/log.c       |    1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 678d485a5582a0ada82d1f63f7d8cc96701981d3
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 20 12:39:36 2012 +0200

    log: fix LOG_TARGET_JOURNAL_OR_KMSG

diff --git a/src/shared/log.c b/src/shared/log.c
index 2151200..a648b83 100644
--- a/src/shared/log.c
+++ b/src/shared/log.c
@@ -546,6 +546,7 @@ static int log_dispatch(
                 if (k <= 0 &&
                     (log_target == LOG_TARGET_AUTO ||
                      log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
+                     log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
                      log_target == LOG_TARGET_KMSG)) {
 
                         k = write_to_kmsg(level, file, line, func, buffer);

commit 71f737d2de635d4ac6183face7e9c8b7981631ab
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 20 12:39:09 2012 +0200

    mount-setup: don't log with LOG_ERROR if a mount that doesn't matter fails

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 961773b..d902211 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -131,7 +131,7 @@ static int mount_one(const MountPoint *p, bool relabel) {
                   p->type,
                   p->flags,
                   p->options) < 0) {
-                log_error("Failed to mount %s: %s", p->where, strerror(errno));
+                log_full(p->fatal ? LOG_ERR : LOG_DEBUG, "Failed to mount %s: %s", p->where, strerror(errno));
                 return p->fatal ? -errno : 0;
         }
 

commit a0a3844815b0f346dba03f41245c620f432e462f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Apr 20 12:37:57 2012 +0200

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

diff --git a/TODO b/TODO
index efe76f3..19ca603 100644
--- a/TODO
+++ b/TODO
@@ -24,6 +24,10 @@ Features:
 
 * 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
@@ -153,8 +157,6 @@ Features:
 
 * support "systemctl stop foobar at .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
diff --git a/src/core/main.c b/src/core/main.c
index e3ea868..290de26 100644
--- 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;
-                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)