X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=ce9c1e099f071d51245b8610e90db514fcb7a29b;hp=e5803a76dcf0fbc228f2c426b19c415c28d382ef;hb=1d69ceee0b8fac1f4451a75b6e4b14ee2d5d91dc;hpb=1ae17ad22c1d111e35d75d4e93d609efd61b5329 diff --git a/discover/boot.c b/discover/boot.c index e5803a7..ce9c1e0 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -340,6 +340,11 @@ static void cleanup_cancellations(struct boot_task *task, } else if (result->status == LOAD_ASYNC) { load_url_async_cancel(result); pending = true; + + /* if we're waiting for a cancellation, we still need to + * wait for the completion before freeing the boot task */ + } else if (result->status == LOAD_CANCELLED) { + pending = true; } }