diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-01-14 19:48:04 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-01-14 21:29:27 -0500 |
| commit | 6b3d378331fe714c7bf2263eaa9a8b33fc878e7c (patch) | |
| tree | 5fca867e0b2cda62c2dc4f1a9a4bd78ab345b158 /src/dissect/dissect.c | |
| parent | ab8864ebc3ac01288729b44f0d5f18fff37defb5 (diff) | |
| parent | bafbac4e85a5eefd4b57a5cd0eb61885fb60edc9 (diff) | |
Merge pull request #4879 from poettering/systemd
Diffstat (limited to 'src/dissect/dissect.c')
| -rw-r--r-- | src/dissect/dissect.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index f2f1e135ec..fd9db5ba87 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -35,7 +35,7 @@ static enum { } arg_action = ACTION_DISSECT; static const char *arg_image = NULL; static const char *arg_path = NULL; -static DissectImageFlags arg_flags = DISSECT_IMAGE_DISCARD_ON_LOOP; +static DissectImageFlags arg_flags = DISSECT_IMAGE_REQUIRE_ROOT|DISSECT_IMAGE_DISCARD_ON_LOOP; static void *arg_root_hash = NULL; static size_t arg_root_hash_size = 0; @@ -191,7 +191,7 @@ int main(int argc, char *argv[]) { goto finish; } - r = dissect_image(d->fd, arg_root_hash, arg_root_hash_size, &m); + r = dissect_image(d->fd, arg_root_hash, arg_root_hash_size, arg_flags, &m); if (r == -ENOPKG) { log_error_errno(r, "Couldn't identify a suitable partition table or file system in %s.", arg_image); goto finish; @@ -221,6 +221,9 @@ int main(int argc, char *argv[]) { p->rw ? "writable" : "read-only", partition_designator_to_string(i)); + if (!sd_id128_is_null(p->uuid)) + printf(" (UUID " SD_ID128_FORMAT_STR ")", SD_ID128_FORMAT_VAL(p->uuid)); + if (p->fstype) printf(" of type %s", p->fstype); |