[systemd-commits] 2 commits - TODO src/core

[Lennart Poettering]

 TODO                     |    2 --
 src/core/selinux-setup.c |    9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 805623aaa43e78d4dcfb74a7cea689a23449eeed
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jul 10 19:36:29 2012 +0200

    update TODO

diff --git a/TODO b/TODO
index 0131a9d..8975ad0 100644
--- a/TODO
+++ b/TODO
@@ -38,8 +38,6 @@ Features:
 
 * switch-root: handle journald restart
 
-* policy loading in initrd generates warning
-
 * segfault in journalctl during /var migration
 
 * systemd-analyze post-boot is broken for initrd

commit dbc655d58dd80d7381d63d4daab894cbb5379079
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jul 10 19:28:26 2012 +0200

    selinux: turn of libselinux' internal logging

diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index d8643bc..22ca820 100644
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -36,6 +36,10 @@
 #include "log.h"
 #include "label.h"
 
+static int null_log(int type, const char *fmt, ...) {
+        return 0;
+}
+
 int selinux_setup(bool *loaded_policy) {
 
 #ifdef HAVE_SELINUX
@@ -43,9 +47,14 @@ int selinux_setup(bool *loaded_policy) {
        usec_t before_load, after_load;
        security_context_t con;
        int r;
+       union selinux_callback cb;
 
        assert(loaded_policy);
 
+       /* Turn off all of SELinux' own logging, we want to do that */
+       cb.func_log = null_log;
+       selinux_set_callback(SELINUX_CB_LOG, cb);
+
        /* Make sure getcon() works, which needs /proc and /sys */
        mount_setup_early();