nspawn,mount-util: add [u]mount_verbose and use it in nspawn

[elogind.git] / src / basic / mount-util.h

diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index 9ed5b284ceab5e275c02a1ac30b9c49b8accd02e..33453aa9fb20c4d869ce46b03c0a424bc0c8a8fb 100644 (file)
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -36,7 +36,7 @@ int path_is_mount_point(const char *path, int flags);
 int repeat_unmount(const char *path, int flags);
 
 int umount_recursive(const char *target, int flags);
 int repeat_unmount(const char *path, int flags);
 
 int umount_recursive(const char *target, int flags);

-int bind_remount_recursive(const char *prefix, bool ro);
+int bind_remount_recursive(const char *prefix, bool ro, char **blacklist);

 
 int mount_move_root(const char *path);
 #endif // 0
 
 int mount_move_root(const char *path);
 #endif // 0


@@ -56,3 +56,12 @@ union file_handle_union {
 const char* mode_to_inaccessible_node(mode_t mode);
 
 #define FILE_HANDLE_INIT { .handle.handle_bytes = MAX_HANDLE_SZ }
 const char* mode_to_inaccessible_node(mode_t mode);
 
 #define FILE_HANDLE_INIT { .handle.handle_bytes = MAX_HANDLE_SZ }

+
+int mount_verbose(
+                int error_log_level,
+                const char *what,
+                const char *where,
+                const char *type,
+                unsigned long flags,
+                const char *options);
+int umount_verbose(const char *where);