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.c | |
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.c')
-rw-r--r-- | src/nspawn/nspawn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index ab93f98df4..fca2b72edd 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2450,7 +2450,7 @@ static int inner_child( } } - r = mount_all(NULL, arg_userns, true, arg_uid_shift, arg_uid_range, arg_selinux_apifs_context); + r = mount_all(NULL, arg_userns, true, arg_uid_shift, arg_private_network, arg_uid_range, arg_selinux_apifs_context); if (r < 0) return r; @@ -2705,7 +2705,7 @@ static int outer_child( return log_error_errno(r, "Failed to make tree read-only: %m"); } - r = mount_all(directory, arg_userns, false, arg_uid_shift, arg_uid_range, arg_selinux_apifs_context); + r = mount_all(directory, arg_userns, false, arg_private_network, arg_uid_shift, arg_uid_range, arg_selinux_apifs_context); if (r < 0) return r; |