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

Commit f389e419 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Gerrit Code Review
Browse files

Merge "Don't SIGABORT if device-mapper doesn't generate uevent for DeleteDevice"

parents 3d152c92 3b39a9ef

fs_mgr/libdm/dm.cpp

+4 −2
Original line number Diff line number Diff line
@@ -111,8 +111,10 @@ bool DeviceMapper::DeleteDevice(const std::string& name, 


    // Check to make sure appropriate uevent is generated so ueventd will

    // do the right thing and remove the corresponding device node and symlinks.

    CHECK(io.flags & DM_UEVENT_GENERATED_FLAG)

            << "Didn't generate uevent for [" << name << "] removal";

    if ((io.flags & DM_UEVENT_GENERATED_FLAG) == 0) {

        LOG(ERROR) << "Didn't generate uevent for [" << name << "] removal";

        return false;

    }



    if (timeout_ms <= std::chrono::milliseconds::zero()) {

        return true;