From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 20 Jun 2023 20:05:53 +0000 (+0200)
Subject: dissect: port to vpick for selecting image
X-Git-Tag: v256-rc1~1319^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7688568191077b36c71e8ad5b5356695c69b406;p=thirdparty%2Fsystemd.git

dissect: port to vpick for selecting image
---

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 6a8193f6187..10af26888e5 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -48,6 +48,7 @@
 #include "tmpfile-util.h"
 #include "uid-alloc-range.h"
 #include "user-util.h"
+#include "vpick.h"
 
 static enum {
         ACTION_DISSECT,
@@ -1817,6 +1818,16 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
+        if (arg_image) {
+                r = path_pick_update_warn(
+                                &arg_image,
+                                &pick_filter_image_raw,
+                                PICK_ARCHITECTURE|PICK_TRIES,
+                                /* ret_result= */ NULL);
+                if (r < 0)
+                        return r;
+        }
+
         switch (arg_action) {
         case ACTION_UMOUNT:
                 return action_umount(arg_path);