summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-06-27 04:14:27 +0200
committerLennart Poettering <lennart@poettering.net>2013-06-27 04:17:34 +0200
commit4ad490007b70e6ac18d3cb04fa2ed92eba1451fa (patch)
tree20c7aab57b1f2722be1a057a28a6e7c16788c976 /units
parentabb26902e424c4142b68ead35676028b12249b77 (diff)
core: general cgroup rework
Replace the very generic cgroup hookup with a much simpler one. With this change only the high-level cgroup settings remain, the ability to set arbitrary cgroup attributes is removed, so is support for adding units to arbitrary cgroup controllers or setting arbitrary paths for them (especially paths that are different for the various controllers). This also introduces a new -.slice root slice, that is the parent of system.slice and friends. This enables easy admin configuration of root-level cgrouo properties. This replaces DeviceDeny= by DevicePolicy=, and implicitly adds in /dev/null, /dev/zero and friends if DeviceAllow= is used (unless this is turned off by DevicePolicy=).
Diffstat (limited to 'units')
-rw-r--r--units/-.slice12
-rw-r--r--units/slices.target4
-rw-r--r--units/system.slice2
3 files changed, 16 insertions, 2 deletions
diff --git a/units/-.slice b/units/-.slice
new file mode 100644
index 0000000000..ac82c35874
--- /dev/null
+++ b/units/-.slice
@@ -0,0 +1,12 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=Root Slice
+Documentation=man:systemd.special(7)
+DefaultDependencies=no
+Before=slices.target
diff --git a/units/slices.target b/units/slices.target
index cbfdba0055..a29310c047 100644
--- a/units/slices.target
+++ b/units/slices.target
@@ -8,5 +8,5 @@
[Unit]
Description=Slices
Documentation=man:systemd.special(7)
-Wants=system.slice
-After=system.slice
+Wants=-.slice system.slice
+After=-.slice system.slice
diff --git a/units/system.slice b/units/system.slice
index 8281fe58f6..c0e3df9d0f 100644
--- a/units/system.slice
+++ b/units/system.slice
@@ -10,3 +10,5 @@ Description=System Slice
Documentation=man:systemd.special(7)
DefaultDependencies=no
Before=slices.target
+Wants=-.slice
+After=-.slice