From a50fe2cb853022f2dd2c02fd1a230e3050bbf524 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Tue, 21 Nov 2017 11:39:44 +0100 Subject: [PATCH] unit.conf: Remove unset of capabilities MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove the unsetting of capabilities because it currently breaks the image. To be reworked. Change-Id: I69a1d9c23f463a36edebb7993aa94fae14fb60e8 Signed-off-by: José Bollo --- conf/afm-unit-debug.conf.in | 4 ++-- conf/afm-unit.conf.in | 4 ++-- conf/generate-unit-conf/service.inc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in index 8e6fbed..a770fbc 100644 --- a/conf/afm-unit-debug.conf.in +++ b/conf/afm-unit-debug.conf.in @@ -122,8 +122,8 @@ SuccessExitStatus=0 SIGKILL #PAMName=su User=%i Slice=user-%i.slice -CapabilityBoundingSet= -AmbientCapabilities= +#CapabilityBoundingSet= +#AmbientCapabilities= {{#required-permission.urn:AGL:permission::platform:no-oom}}OOMScoreAdjust=-500{{/required-permission.urn:AGL:permission::platform:no-oom}} {{#required-permission.urn:AGL:permission::partner:real-time}}IOSchedulingClass=realtime{{/required-permission.urn:AGL:permission::partner:real-time}} {{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}} diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in index 1e95769..11ad15a 100644 --- a/conf/afm-unit.conf.in +++ b/conf/afm-unit.conf.in @@ -122,8 +122,8 @@ SuccessExitStatus=0 SIGKILL #PAMName=su User=%i Slice=user-%i.slice -CapabilityBoundingSet= -AmbientCapabilities= +#CapabilityBoundingSet= +#AmbientCapabilities= {{#required-permission.urn:AGL:permission::platform:no-oom}}OOMScoreAdjust=-500{{/required-permission.urn:AGL:permission::platform:no-oom}} {{#required-permission.urn:AGL:permission::partner:real-time}}IOSchedulingClass=realtime{{/required-permission.urn:AGL:permission::partner:real-time}} {{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}} diff --git a/conf/generate-unit-conf/service.inc b/conf/generate-unit-conf/service.inc index f2341d1..21e16e3 100644 --- a/conf/generate-unit-conf/service.inc +++ b/conf/generate-unit-conf/service.inc @@ -53,8 +53,8 @@ SuccessExitStatus=0 SIGKILL User=%i Slice=user-%i.slice -CapabilityBoundingSet= -AmbientCapabilities= +#CapabilityBoundingSet= +#AmbientCapabilities= ON_PERM(:platform:no-oom, OOMScoreAdjust=-500) ON_PERM(:partner:real-time, IOSchedulingClass=realtime) -- 2.16.6