mount-util: reorder params for mount_in_userspace, clean up logging

This commit is contained in:
Mike Yuan
2024-07-23 19:31:32 +02:00
parent 974e34a018
commit e633e8627f
2 changed files with 66 additions and 33 deletions
+20 -4
View File
@@ -70,8 +70,6 @@ int umount_verbose(
const char *where,
int flags);
int mount_exchange_graceful(int fsmount_fd, const char *dest, bool mount_beneath);
int mount_option_mangle(
const char *options,
unsigned long mount_flags,
@@ -106,8 +104,26 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(char*, umount_and_free);
char* umount_and_unlink_and_free(char *p);
DEFINE_TRIVIAL_CLEANUP_FUNC(char*, umount_and_unlink_and_free);
int bind_mount_in_namespace(PidRef *target, const char *propagate_path, const char *incoming_path, const char *src, const char *dest, bool read_only, bool make_file_or_directory);
int mount_image_in_namespace(PidRef *target, const char *propagate_path, const char *incoming_path, const char *src, const char *dest, bool read_only, bool make_file_or_directory, const MountOptions *options, const ImagePolicy *image_policy);
int mount_exchange_graceful(int fsmount_fd, const char *dest, bool mount_beneath);
int bind_mount_in_namespace(
const PidRef *target,
const char *propagate_path,
const char *incoming_path,
const char *src,
const char *dest,
bool read_only,
bool make_file_or_directory);
int mount_image_in_namespace(
const PidRef *target,
const char *propagate_path,
const char *incoming_path,
const char *src,
const char *dest,
bool read_only,
bool make_file_or_directory,
const MountOptions *options,
const ImagePolicy *image_policy);
int make_mount_point(const char *path);
int fd_make_mount_point(int fd);