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

Commit 6a62cac4 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Further cleanup of the logic in device_init."

parents 6dbbcc57 56a0656e
Loading
Loading
Loading
Loading
+11 −11
Original line number Diff line number Diff line
@@ -992,22 +992,22 @@ void device_init() {

    /* is 256K enough? udev uses 16MB! */
    device_fd = uevent_open_socket(256*1024, true);
    if(device_fd < 0)
    if (device_fd == -1) {
        return;

    }
    fcntl(device_fd, F_SETFL, O_NONBLOCK);

    struct stat info;
    if (stat(COLDBOOT_DONE, &info) < 0) {
    if (access(COLDBOOT_DONE, F_OK) == 0) {
        NOTICE("Skipping coldboot, already done!\n");
        return;
    }

    Timer t;
    coldboot("/sys/class");
    coldboot("/sys/block");
    coldboot("/sys/devices");
    close(open(COLDBOOT_DONE, O_WRONLY|O_CREAT|O_CLOEXEC, 0000));
    NOTICE("Coldboot took %.2fs.\n", t.duration());
    } else {
        NOTICE("Skipping coldboot, already done!\n");
    }
}

int get_device_fd()