diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-10-20 12:22:32 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-10-20 12:22:32 +0200 |
| commit | c91960c5a04a3515c43f50a358588f056b8575a6 (patch) | |
| tree | 1f6406d2604cc67f455ca5790b19acc65eb345c7 /src/nspawn/nspawn-mount.h | |
| parent | 824b35c3859bc99b97ac5fa6e09aa34627e9bcd5 (diff) | |
| parent | d167824896e583ffaca891b1c355ff852496ff66 (diff) | |
Merge pull request #1619 from iaguis/nspawn-sysfs-netns-3
nspawn: skip /sys-as-tmpfs if we don't use private-network
Diffstat (limited to 'src/nspawn/nspawn-mount.h')
| -rw-r--r-- | src/nspawn/nspawn-mount.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h index 54cab87665..bdab23bcca 100644 --- a/src/nspawn/nspawn-mount.h +++ b/src/nspawn/nspawn-mount.h @@ -57,7 +57,7 @@ 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 use_userns, bool in_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, bool use_netns, 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); |