From: Michal Sekletar <msekleta@redhat.com>
Date: Wed, 12 Nov 2014 14:19:42 +0000 (+0100)
Subject: units: skip mounting /dev/hugepages if we don't have CAP_SYS_ADMIN
X-Git-Tag: v218~121
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fe0b9cd3ba25fb5063b6782983dde0a0c9915660

units: skip mounting /dev/hugepages if we don't have CAP_SYS_ADMIN

Preparation for allowing systemd to run gracefully in containers lacking
CAP_SYS_ADMIN.
---

diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount
index d711faed5..882adb454 100644
--- a/units/dev-hugepages.mount
+++ b/units/dev-hugepages.mount
@@ -12,6 +12,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
 DefaultDependencies=no
 Before=sysinit.target
 ConditionPathExists=/sys/kernel/mm/hugepages
+ConditionCapability=CAP_SYS_ADMIN
 
 [Mount]
 What=hugetlbfs