]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dissect: port to vpick for selecting image
authorLennart Poettering <lennart@poettering.net>
Tue, 20 Jun 2023 20:05:53 +0000 (22:05 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 3 Jan 2024 17:38:46 +0000 (18:38 +0100)
src/dissect/dissect.c

index 6a8193f6187fadb39633936377efaf43ed6e0648..10af26888e5bc2bca15205868a537252516bb196 100644 (file)
@@ -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);