Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aadf9f11 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 4ad20e55: Merge "Redirect libselinux logging to dmesg for ueventd." 

* commit '4ad20e55':
  Redirect libselinux logging to dmesg for ueventd.
parents c309b97e 4ad20e55

init/init.c

+1 −1
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ static int audit_callback(void *data, security_class_t cls __attribute__((unused 
    return 0;

}



static int log_callback(int type, const char *fmt, ...)

int log_callback(int type, const char *fmt, ...)

{

    int level;

    va_list ap;

init/log.h

+2 −0
Original line number Diff line number Diff line
@@ -23,4 +23,6 @@ 
#define NOTICE(x...)  KLOG_NOTICE("init", x)

#define INFO(x...)    KLOG_INFO("init", x)



extern int log_callback(int type, const char *fmt, ...);



#endif

init/ueventd.c

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <stdio.h>

#include <ctype.h>

#include <signal.h>

#include <selinux/selinux.h>



#include <private/android_filesystem_config.h>
@@ -76,6 +77,10 @@ int ueventd_main(int argc, char **argv) 
    }

#endif



    union selinux_callback cb;

    cb.func_log = log_callback;

    selinux_set_callback(SELINUX_CB_LOG, cb);



    INFO("starting ueventd\n");



    /* Respect hardware passed in through the kernel cmd line. Here we will look