diff options
author | Daniel Mack <github@zonque.org> | 2015-09-30 15:55:26 +0200 |
---|---|---|
committer | Daniel Mack <github@zonque.org> | 2015-09-30 15:55:26 +0200 |
commit | 1115d417067190d5144586e0147b5ca7a917227c (patch) | |
tree | fb101d9c4a7c3b041db537a9aacba40fd469132a /src/nspawn/nspawn-mount.h | |
parent | 6b68a4442e2b9343d10476810c6662b496dd250d (diff) | |
parent | 2ca2a91cf1deba83825692f1ce06116d2aed2379 (diff) |
Merge pull request #1417 from poettering/nspawn-and-more
Various fixes, primarily for nspawn, but other stuff too
Diffstat (limited to 'src/nspawn/nspawn-mount.h')
-rw-r--r-- | src/nspawn/nspawn-mount.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h index 5abd44cc4b..54cab87665 100644 --- a/src/nspawn/nspawn-mount.h +++ b/src/nspawn/nspawn-mount.h @@ -57,7 +57,8 @@ int tmpfs_mount_parse(CustomMount **l, unsigned *n, const char *s); int custom_mount_compare(const void *a, const void *b); -int mount_all(const char *dest, bool userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context); +int mount_all(const char *dest, bool use_userns, bool in_userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context); +int mount_sysfs(const char *dest); int mount_cgroups(const char *dest, bool unified_requested, bool userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context); int mount_systemd_cgroup_writable(const char *dest, bool unified_requested); |