summaryrefslogtreecommitdiff
path: root/src/sysext
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2022-09-02 19:09:51 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2022-09-03 01:32:01 +0900
commitbad31660eda404b034d20ea0d4b22ca45009f183 (patch)
tree63902b397a92a24e9404543e352b176efdfba7b1 /src/sysext
parent062d511776943c26f6952ccfabc4e9f9f8e5a58d (diff)
downloadsystemd-bad31660eda404b034d20ea0d4b22ca45009f183.tar.gz
dissect-image: introduce dissect_loop_device() which takes LoopDevice object
Diffstat (limited to 'src/sysext')
-rw-r--r--src/sysext/sysext.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 6e533f335c..93ddc73b46 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -539,14 +539,11 @@ static int merge_subprocess(Hashmap *images, const char *workspace) {
if (r < 0)
return log_error_errno(r, "Failed to set up loopback device for %s: %m", img->path);
- r = dissect_image_and_warn(
- d->fd,
+ r = dissect_loop_device_and_warn(
img->path,
+ d,
&verity_settings,
NULL,
- d->diskseq,
- d->uevent_seqnum_not_before,
- d->timestamp_not_before,
flags,
&m);
if (r < 0)