dissect: always invalidate secondary arch partitions if we found primary arch
authorLennart Poettering <lennart@poettering.net>
Thu, 17 Sep 2020 15:32:34 +0000 (17:32 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 20 Sep 2020 10:43:41 +0000 (12:43 +0200)
commitb6efbbfb001a41c4e74a716f73c67abe8250594e
tree6bb261026969a4e8e8aec60a28be556b8773ccfa
parentdc5c5cd5c864aaae8c2695c2b833d556d8df0f98
dissect: always invalidate secondary arch partitions if we found primary arch

Let's suppress the secondary arch data, since we never ever want to
mount it if we found the primary arch.

Previously we only suppressed in the Verity case, but there's little
reason to entertain the idea of a secondary arch in non-Verity
environments either, we are not going to use them, and should not do
decryption or anything like that.

(cherry picked from commit 74cb2db9f403dfe17cabc6dac48b0f49a84eb03f)
(cherry picked from commit 418cf0e78c067f7249f4769f78c8c199d907935f)
(cherry picked from commit 7f2b6a50d3c47da8a697f50c0bc191902ebec069)
src/shared/dissect-image.c