namespace: beef up read-only bind mount logic

[elogind.git] / src / shared / util.h

diff --git a/src/shared/util.h b/src/shared/util.h
index f2ce4f0d6ede6a1bd4bf61ab94c5c69c9f2a28dd..952239e7e6fe1b55fabadc13baf54aefcd2840e4 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -478,6 +478,7 @@ char *ellipsize(const char *s, size_t length, unsigned percent);
                                    /* bytes                 columns */
 char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent);
 
                                    /* bytes                 columns */
 char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent);
 

+int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);

 int touch(const char *path);
 
 char *unquote(const char *s, const char *quotes);
 int touch(const char *path);
 
 char *unquote(const char *s, const char *quotes);


@@ -910,8 +911,8 @@ int parse_proc_cmdline(int (*parse_word)(const char *key, const char *value));
 
 int container_get_leader(const char *machine, pid_t *pid);
 
 
 int container_get_leader(const char *machine, pid_t *pid);
 

-int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *root_fd);
-int namespace_enter(int pidns_fd, int mntns_fd, int root_fd);
+int namespace_open(pid_t pid, int *pidns_fd, int *mntns_fd, int *netns_fd, int *root_fd);
+int namespace_enter(int pidns_fd, int mntns_fd, int netns_fd, int root_fd);

 
 bool pid_is_alive(pid_t pid);
 bool pid_is_unwaited(pid_t pid);
 
 bool pid_is_alive(pid_t pid);
 bool pid_is_unwaited(pid_t pid);


@@ -941,3 +942,7 @@ union file_handle_union {
 };
 
 int update_reboot_param_file(const char *param);
 };
 
 int update_reboot_param_file(const char *param);

+
+int umount_recursive(const char *target, int flags);
+
+int bind_remount_recursive(const char *prefix, bool ro);