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

Commit 68f850fe authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge ca7fdffa on remote branch 

Change-Id: Icefcff2ad578b65906706b105603189d1b3ae8cb
parents d3176974 ca7fdffa

fs_mgr/fs_mgr.c

100644 → 100755
+12 −0
Original line number Diff line number Diff line
@@ -543,12 +543,24 @@ int fs_mgr_mount_all(struct fstab *fstab) 
    int mret = -1;

    int mount_errno = 0;

    int attempted_idx = -1;

    char propbuf[PROPERTY_VALUE_MAX];

    bool is_ffbm = false;



    if (!fstab) {

        return -1;

    }

    /**get boot mode*/

    property_get("ro.bootmode", propbuf, "");

    if (strncmp(propbuf, "ffbm", 4) == 0)

        is_ffbm = true;



    for (i = 0; i < fstab->num_entries; i++) {

        /* Skip userdata partition in ffbm mode */

        if (is_ffbm && !strcmp(fstab->recs[i].mount_point, "/data")){

            INFO("ffbm mode,skip mount userdata");

            continue;

        }



        /* Don't mount entries that are managed by vold */

        if (fstab->recs[i].fs_mgr_flags & (MF_VOLDMANAGED | MF_RECOVERYONLY)) {

            continue;

init/builtins.cpp

+6 −0
Original line number Diff line number Diff line
@@ -545,6 +545,12 @@ static int do_mount_all(const std::vector<std::string>& args) { 
    /* Paths of .rc files are specified at the 2nd argument and beyond */

    import_late(args, 2);



    std::string bootmode = property_get("ro.bootmode");

    if (strncmp(bootmode.c_str(), "ffbm", 4) == 0) {

        NOTICE("ffbm mode, not start class main\n");

        return 0;

    }



    if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {

        ActionManager::GetInstance().QueueEventTrigger("encrypt");

    } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {

libnetutils/ifc_utils.c

+1 −2
Original line number Diff line number Diff line
@@ -173,8 +173,7 @@ void ifc_close6(void) 
static void ifc_init_ifr(const char *name, struct ifreq *ifr)

{

    memset(ifr, 0, sizeof(struct ifreq));

    strncpy(ifr->ifr_name, name, IFNAMSIZ);

    ifr->ifr_name[IFNAMSIZ - 1] = 0;

    strlcpy(ifr->ifr_name, name, IFNAMSIZ);

}



int ifc_get_hwaddr(const char *name, void *ptr)

logcat/logcat.cpp

+8 −1
Original line number Diff line number Diff line
@@ -169,10 +169,17 @@ static void writeEntryToLogDump(AndroidLogEntry *entry) 
{

    int bytesWrittenToLogDump = 0;

    char defaultBuffer[512];

    char *outBuffer = NULL;

    size_t logLength;



    // Get logLength

    android_log_formatLogLine(g_logformat, defaultBuffer,sizeof(defaultBuffer), entry, &logLength);

    outBuffer = android_log_formatLogLine(g_logformat, defaultBuffer,

                                          sizeof(defaultBuffer),

                                          entry,

                                          &logLength);

    if (outBuffer != defaultBuffer) {

        free(outBuffer);

    }



    // Check if the to-be-inserted log exceeds the available buffer size; And rotate if needed.

    checkAndRotateLogDump(logLength);

rootdir/init.rc

+0 −1
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ on property:vold.decrypt=trigger_restart_min_framework 
    # A/B update verifier that marks a successful boot.

    exec - root -- /system/bin/update_verifier trigger_restart_min_framework

    class_start main

    start time_daemon



on property:vold.decrypt=trigger_restart_framework

    # A/B update verifier that marks a successful boot.