summaryrefslogtreecommitdiff
path: root/src/dissect/dissect.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2022-09-01 12:38:53 +0200
committerLennart Poettering <lennart@poettering.net>2022-09-01 22:05:10 +0200
commit234c2e16e5686d1a49fe84e534d4edb2db8d3719 (patch)
treee0db0ef1c46e0ec08cd850327d1e3d3f6c452317 /src/dissect/dissect.c
parente8383058b2378e516b1a6c092b323537624db475 (diff)
downloadsystemd-234c2e16e5686d1a49fe84e534d4edb2db8d3719.tar.gz
dissect: drop partition removal code
This reverts a major chunk of 75d7e04eb4662a814c26010d447eed8a862f5ec1 Now that the loopback device code already destroys the partitions we don't have to do this here anymore. I am sure the right place to delete the partitions is in the loopback code, since we really only should do that for loopback devices, see bug #24431, and not on "real" block devices. I am also not convinced dropping partitions the dissection logic doesn't care about is a good idea, after all. The dissection stuff should probably not consider itself the "owner" of the block devices it analyzes, but take a more passive role: figure out what is what, but not modify it. Fixes: #24431
Diffstat (limited to 'src/dissect/dissect.c')
-rw-r--r--src/dissect/dissect.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 0c33cacdba..858ed6a8f9 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -685,7 +685,6 @@ static int action_mount(DissectedImage *m, LoopDevice *d) {
return log_error_errno(r, "Failed to relinquish DM devices: %m");
}
- dissected_image_relinquish(m);
loop_device_relinquish(d);
return 0;
}
@@ -738,7 +737,6 @@ static int action_copy(DissectedImage *m, LoopDevice *d) {
return log_error_errno(r, "Failed to relinquish DM devices: %m");
}
- dissected_image_relinquish(m);
loop_device_relinquish(d);
if (arg_action == ACTION_COPY_FROM) {