]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dissect-image: also derive read-only mode from fstype in non-partitioned mode
authorLennart Poettering <lennart@poettering.net>
Wed, 8 Sep 2021 15:29:06 +0000 (17:29 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 10 Sep 2021 12:15:22 +0000 (14:15 +0200)
For the GPT partitioned logic we also consult the fstype to determine whether
a partition is read-only (i.e. squashfs is already read-only). For the
non-partitioned mode we didn't do that so far. Fix that.

src/shared/dissect-image.c

index 8d5c7e08e353d87f64e8e29ae5c6c23c8de0ea83..4f398316ae3b4e61a9d9f98e3891955335af192e 100644 (file)
@@ -816,7 +816,7 @@ int dissect_image(
 
                         m->partitions[PARTITION_ROOT] = (DissectedPartition) {
                                 .found = true,
-                                .rw = !m->verity_ready,
+                                .rw = !m->verity_ready && !fstype_is_ro(fstype),
                                 .partno = -1,
                                 .architecture = _ARCHITECTURE_INVALID,
                                 .fstype = TAKE_PTR(t),