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

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

am 178299fd: Merge "init: don\'t double mount /proc and /sys"

* commit '178299fd':
  init: don't double mount /proc and /sys
parents 6b6df173 178299fd
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -981,14 +981,20 @@ int main(int argc, char** argv) {

    add_environment("PATH", _PATH_DEFPATH);

    bool is_first_stage = (argc == 1) || (strcmp(argv[1], "--second-stage") != 0);

    // Get the basic filesystem setup we need put together in the initramdisk
    // on / and then we'll let the rc file figure out the rest.
    // TODO: avoid mounting tmpfs twice, once in the first stage, and once in the
    // second stage.
    mount("tmpfs", "/dev", "tmpfs", MS_NOSUID, "mode=0755");
    mkdir("/dev/pts", 0755);
    mkdir("/dev/socket", 0755);
    mount("devpts", "/dev/pts", "devpts", 0, NULL);
    if (is_first_stage) {
        mount("proc", "/proc", "proc", 0, NULL);
        mount("sysfs", "/sys", "sysfs", 0, NULL);
    }

    // Indicate that booting is in progress to background fw loaders, etc.
    close(open("/dev/.booting", O_WRONLY | O_CREAT | O_CLOEXEC, 0000));
@@ -1001,7 +1007,6 @@ int main(int argc, char** argv) {
    klog_init();
    klog_set_level(KLOG_NOTICE_LEVEL);

    bool is_first_stage = (argc == 1) || (strcmp(argv[1], "--second-stage") != 0);
    NOTICE("init%s started!\n", is_first_stage ? "" : " second stage");

    property_init();