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

Commit 6e05552e authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge "init: run fsck for early mount partitions"

parents 10601fd5 81ae0750

fs_mgr/fs_mgr.cpp

+3 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,9 @@ int fs_mgr_do_mount_one(struct fstab_rec *rec) 
        return FS_MGR_DOMNT_FAILED;

    }



    // Run fsck if needed

    prepare_fs_for_mount(rec->blk_device, rec);



    int ret = __mount(rec->blk_device, rec->mount_point, rec);

    if (ret) {

      ret = (errno == EBUSY) ? FS_MGR_DOMNT_BUSY : FS_MGR_DOMNT_FAILED;

init/init.cpp

+4 −0
Original line number Diff line number Diff line
@@ -670,6 +670,10 @@ int main(int argc, char** argv) { 
        CHECKCALL(mknod("/dev/random", S_IFCHR | 0666, makedev(1, 8)));

        CHECKCALL(mknod("/dev/urandom", S_IFCHR | 0666, makedev(1, 9)));



        // This is needed for log wrapper, which gets called before ueventd runs.

        CHECKCALL(mknod("/dev/ptmx", S_IFCHR | 0666, makedev(5, 2)));

        CHECKCALL(mknod("/dev/null", S_IFCHR | 0666, makedev(1, 3)));



        // Mount staging areas for devices managed by vold

        // See storage config details at http://source.android.com/devices/storage/

        CHECKCALL(mount("tmpfs", "/mnt", "tmpfs", MS_NOEXEC | MS_NOSUID | MS_NODEV,

init/selinux.cpp

+2 −0
Original line number Diff line number Diff line
@@ -414,6 +414,8 @@ void SelinuxRestoreContext() { 
    if constexpr (WORLD_WRITABLE_KMSG) {

        selinux_android_restorecon("/dev/kmsg_debug", 0);

    }

    selinux_android_restorecon("/dev/null", 0);

    selinux_android_restorecon("/dev/ptmx", 0);

    selinux_android_restorecon("/dev/socket", 0);

    selinux_android_restorecon("/dev/random", 0);

    selinux_android_restorecon("/dev/urandom", 0);