summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-10-10 16:12:50 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-10-11 16:46:58 -0400
commitada5412039b7c3e24654bc33550471e0a0869631 (patch)
tree3939f228e8ef702367e2aacfdea939958429540d
parentf68c9dd5c6d0862cbcc89d5339715128a3b5d4a9 (diff)
nspawn: simplify arg_us_cgns passing
We would check the condition cg_ns_supported() twice. No functional change.
-rw-r--r--src/nspawn/nspawn-mount.c2
-rw-r--r--src/nspawn/nspawn.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index 25d38aa742..0be06c8c09 100644
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -931,7 +931,7 @@ int mount_cgroups(
if (unified_requested >= CGROUP_UNIFIED_ALL)
return mount_unified_cgroups(dest);
- else if (use_cgns && cg_ns_supported())
+ else if (use_cgns)
return mount_legacy_cgns_supported(unified_requested, userns, uid_shift, uid_range, selinux_apifs_context);
return mount_legacy_cgns_unsupported(dest, unified_requested, userns, uid_shift, uid_range, selinux_apifs_context);
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index a173d171e1..d62b8c6b82 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2724,7 +2724,7 @@ static int inner_child(
arg_uid_shift,
arg_uid_range,
arg_selinux_apifs_context,
- arg_use_cgns);
+ true);
if (r < 0)
return r;
} else {
@@ -3136,7 +3136,7 @@ static int outer_child(
arg_uid_shift,
arg_uid_range,
arg_selinux_apifs_context,
- arg_use_cgns);
+ false);
if (r < 0)
return r;
}