X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=0d3491fd6cb4a61ece94b3bb5c700ff36cb69841;hp=7778b3fd02bc21f588e260e08cb888d20b4a266a;hb=a23e966779d28215470906f06b4de49df10c8e6e;hpb=388e5c51b182e904c088d14c387f61162b07aee6 diff --git a/discover/boot.c b/discover/boot.c index 7778b3f..0d3491f 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -486,9 +486,10 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt, || start_url_load(boot_task, "initrd", initrd, &boot_task->initrd) || start_url_load(boot_task, "dtb", dtb, &boot_task->dtb); - /* If all URLs are local, we may be done. */ if (rc) { - talloc_free(boot_task); + /* Don't call boot_cancel() to preserve the status update */ + boot_task->cancelled = true; + cleanup_cancellations(boot_task, NULL); return NULL; }