discover: Recognise and open LUKS encrypted partitions

[petitboot] / discover / paths.c

diff --git a/discover/paths.c b/discover/paths.c
index 174bdae16581a8084feeeef993bb61e77cc7b1fb..54b843e77ce3d8df07bdf2df906c6c1231f327bc 100644 (file)
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -158,7 +158,7 @@ static int busybox_progress_cb(void *arg)
        p = procinfo_get_process(procinfo);
        handler = p->stdout_data;
 
-       rc = process_stdout_custom(procinfo, &line);
+       rc = process_process_stdout(procinfo, &line);
 
        if (rc) {
                /* Unregister ourselves from progress tracking */
@@ -586,12 +586,14 @@ struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
 
        /* If the url is remote but network is not yet available queue up this
         * load for later */
-       if (url->scheme != pb_url_file &&
-                       getaddrinfo(url->host, NULL, NULL, &res) != 0) {
-               pb_log("load task for %s queued pending network\n", url->full);
-               pending_network_jobs_add(task, flags);
-               task->result->status = LOAD_ASYNC;
-               return task->result;
+       if (url->scheme != pb_url_file) {
+               if (getaddrinfo(url->host, NULL, NULL, &res) != 0) {
+                       pb_log("load task for %s queued pending network\n", url->full);
+                       pending_network_jobs_add(task, flags);
+                       task->result->status = LOAD_ASYNC;
+                       return task->result;
+               }
+               freeaddrinfo(res);
        }
 
        switch (url->scheme) {