From 166ff7316e464fedd9d5bc55831dfaa75f6a1864 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 10 Mar 2021 17:52:54 +0100 Subject: [PATCH] dissect: don't insist on a root/usr partition when just inspecting Let's relax rules here a bit, taking benefit of the fact that DISSECT_IMAGE_REQUIRE_ROOT + DISSECT_IMAGE_GENERIC_ROOT are now separate flags. --- src/dissect/dissect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 10ab834f0d9..57fcbe8d4b8 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -46,7 +46,6 @@ static const char *arg_source = NULL; static const char *arg_target = NULL; static DissectImageFlags arg_flags = DISSECT_IMAGE_GENERIC_ROOT | - DISSECT_IMAGE_REQUIRE_ROOT | DISSECT_IMAGE_DISCARD_ON_LOOP | DISSECT_IMAGE_RELAX_VAR_CHECK | DISSECT_IMAGE_FSCK | @@ -299,6 +298,7 @@ static int parse_argv(int argc, char *argv[]) { arg_image = argv[optind]; arg_path = argv[optind + 1]; + arg_flags |= DISSECT_IMAGE_REQUIRE_ROOT; break; case ACTION_COPY_FROM: @@ -310,7 +310,7 @@ static int parse_argv(int argc, char *argv[]) { arg_source = argv[optind + 1]; arg_target = argc > optind + 2 ? argv[optind + 2] : "-" /* this means stdout */ ; - arg_flags |= DISSECT_IMAGE_READ_ONLY; + arg_flags |= DISSECT_IMAGE_READ_ONLY | DISSECT_IMAGE_REQUIRE_ROOT; break; case ACTION_COPY_TO: @@ -328,6 +328,7 @@ static int parse_argv(int argc, char *argv[]) { arg_target = argv[optind + 1]; } + arg_flags |= DISSECT_IMAGE_REQUIRE_ROOT; break; default: -- 2.47.3