From 719e2e3e69ca2fb34f612060648ff04ee95c89cf Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 2 Nov 2023 08:28:49 +0000 Subject: [PATCH] mount: Make changing mount operation not dependant on pakfire Signed-off-by: Michael Tremer --- src/libpakfire/include/pakfire/mount.h | 3 ++- src/libpakfire/jail.c | 4 ++-- src/libpakfire/mount.c | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libpakfire/include/pakfire/mount.h b/src/libpakfire/include/pakfire/mount.h index b3b14fbb..c924664e 100644 --- a/src/libpakfire/include/pakfire/mount.h +++ b/src/libpakfire/include/pakfire/mount.h @@ -23,9 +23,10 @@ #ifdef PAKFIRE_PRIVATE +#include #include -int pakfire_mount_change_propagation(struct pakfire* pakfire, int propagation, const char* path); +int pakfire_mount_change_propagation(struct pakfire_ctx* ctx, const char* path, int propagation); int pakfire_mount_make_mounpoint(struct pakfire* pakfire, const char* path); diff --git a/src/libpakfire/jail.c b/src/libpakfire/jail.c index ebcb6f31..fff8c7e6 100644 --- a/src/libpakfire/jail.c +++ b/src/libpakfire/jail.c @@ -1705,7 +1705,7 @@ static int pakfire_jail_child(struct pakfire_jail* jail, struct pakfire_jail_exe const char* arch = pakfire_get_effective_arch(jail->pakfire); // Change mount propagation to slave to receive anything from the parent namespace - r = pakfire_mount_change_propagation(jail->pakfire, MS_SLAVE, "/"); + r = pakfire_mount_change_propagation(jail->ctx, "/", MS_SLAVE); if (r) return r; @@ -1715,7 +1715,7 @@ static int pakfire_jail_child(struct pakfire_jail* jail, struct pakfire_jail_exe return r; // Change mount propagation to private - r = pakfire_mount_change_propagation(jail->pakfire, MS_PRIVATE, root); + r = pakfire_mount_change_propagation(jail->ctx, root, MS_PRIVATE); if (r) return r; diff --git a/src/libpakfire/mount.c b/src/libpakfire/mount.c index 25641985..494c2585 100644 --- a/src/libpakfire/mount.c +++ b/src/libpakfire/mount.c @@ -144,12 +144,12 @@ static const struct pakfire_symlink { { NULL }, }; -int pakfire_mount_change_propagation(struct pakfire* pakfire, int propagation, const char* path) { - DEBUG(pakfire, "Changing mount propagation on %s\n", path); +int pakfire_mount_change_propagation(struct pakfire_ctx* ctx, const char* path, int propagation) { + CTX_DEBUG(ctx, "Changing mount propagation on %s\n", path); int r = mount(NULL, path, NULL, propagation|MS_REC, NULL); if (r) - ERROR(pakfire, "Failed to change mount propagation on %s: %m\n", path); + CTX_ERROR(ctx, "Failed to change mount propagation on %s: %m\n", path); return r; } -- 2.39.2