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

Commit 867688a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: introduce ro.kernel.version property" am: 939353e1 am:... 

Merge "init: introduce ro.kernel.version property" am: 939353e1 am: 30b3cb13 am: 750ca56a am: 18f97973

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1840075

Change-Id: Ide868e14092c9660207d344bedc567a8950cb2c2
parents 2de3ce45 18f97973

init/init.cpp

+15 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <sys/mount.h>

#include <sys/signalfd.h>

#include <sys/types.h>

#include <sys/utsname.h>

#include <unistd.h>



#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
@@ -554,6 +555,19 @@ static void SetUsbController() { 
    }

}



/// Set ro.kernel.version property to contain the major.minor pair as returned

/// by uname(2).

static void SetKernelVersion() {

    struct utsname uts;

    unsigned int major, minor;



    if ((uname(&uts) != 0) || (sscanf(uts.release, "%u.%u", &major, &minor) != 2)) {

        LOG(ERROR) << "Could not parse the kernel version from uname";

        return;

    }

    SetProperty("ro.kernel.version", android::base::StringPrintf("%u.%u", major, minor));

}



static void HandleSigtermSignal(const signalfd_siginfo& siginfo) {

    if (siginfo.ssi_pid != 0) {

        // Drop any userspace SIGTERM requests.
@@ -858,6 +872,7 @@ int SecondStageMain(int argc, char** argv) { 
    export_oem_lock_status();

    MountHandler mount_handler(&epoll);

    SetUsbController();

    SetKernelVersion();



    const BuiltinFunctionMap& function_map = GetBuiltinFunctionMap();

    Action::set_function_map(&function_map);