From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 2 Nov 2023 08:28:49 +0000 (+0000)
Subject: mount: Make changing mount operation not dependant on pakfire
X-Git-Tag: 0.9.30~1317
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=719e2e3e69ca2fb34f612060648ff04ee95c89cf;p=pakfire.git

mount: Make changing mount operation not dependant on pakfire

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/include/pakfire/mount.h b/src/libpakfire/include/pakfire/mount.h
index b3b14fbb8..c924664e6 100644
--- a/src/libpakfire/include/pakfire/mount.h
+++ b/src/libpakfire/include/pakfire/mount.h
@@ -23,9 +23,10 @@
 
 #ifdef PAKFIRE_PRIVATE
 
+#include <pakfire/ctx.h>
 #include <pakfire/pakfire.h>
 
-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 ebcb6f31a..fff8c7e67 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 25641985e..494c25852 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;
 }