summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-06-18 00:59:54 +0200
committerLennart Poettering <lennart@poettering.net>2013-06-18 00:59:54 +0200
commitf2561e85982ed25b610cad6253599a051f9ec8e2 (patch)
tree7c7f5de7121e99cba078c3b3096456265ccfaedd
parenta016b9228f338cb9b380ce7e00826ef462767d98 (diff)
units: add default units for system.slice, user.slice, machine.slice
-rw-r--r--Makefile.am7
-rw-r--r--units/basic.target4
-rw-r--r--units/machine.slice13
-rw-r--r--units/slices.target12
-rw-r--r--units/system.slice11
-rw-r--r--units/user.slice13
6 files changed, 58 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 5a285be343..f84236d8a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -222,6 +222,7 @@ install-target-wants-hook:
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
+ what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
define add-wants
[ -z "$$what" ] || ( \
@@ -376,6 +377,10 @@ dist_systemunit_DATA = \
units/paths.target \
units/suspend.target \
units/swap.target \
+ units/slices.target \
+ units/system.slice \
+ units/user.slice \
+ units/machine.slice \
units/systemd-initctl.socket \
units/systemd-shutdownd.socket \
units/syslog.socket \
@@ -4181,6 +4186,8 @@ USER_UNIT_ALIASES += \
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
$(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
+ $(systemunitdir)/machine.slice $(pkgsysconfdir)/system/slices.target.wants/machine.slice \
+ $(systemunitdir)/user.slice $(pkgsysconfdir)/system/slices.target.wants/user.slice \
$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
diff --git a/units/basic.target b/units/basic.target
index 6b9cfe4c97..d7c68f4e2c 100644
--- a/units/basic.target
+++ b/units/basic.target
@@ -9,6 +9,6 @@
Description=Basic System
Documentation=man:systemd.special(7)
Requires=sysinit.target
-Wants=sockets.target timers.target paths.target
-After=sysinit.target sockets.target timers.target paths.target
+Wants=sockets.target timers.target paths.target slices.target
+After=sysinit.target sockets.target timers.target paths.target slices.target
RefuseManualStart=yes
diff --git a/units/machine.slice b/units/machine.slice
new file mode 100644
index 0000000000..6b1754b9dc
--- /dev/null
+++ b/units/machine.slice
@@ -0,0 +1,13 @@
+# 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=Virtual Machine and Container Slice
+Documentation=man:systemd.special(7)
+
+[Install]
+WantedBy=slices.target
diff --git a/units/slices.target b/units/slices.target
new file mode 100644
index 0000000000..cbfdba0055
--- /dev/null
+++ b/units/slices.target
@@ -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=Slices
+Documentation=man:systemd.special(7)
+Wants=system.slice
+After=system.slice
diff --git a/units/system.slice b/units/system.slice
new file mode 100644
index 0000000000..f78ecb4388
--- /dev/null
+++ b/units/system.slice
@@ -0,0 +1,11 @@
+# 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=System Slice
+Documentation=man:systemd.special(7)
+DefaultDependencies=no
diff --git a/units/user.slice b/units/user.slice
new file mode 100644
index 0000000000..dfaa44bcac
--- /dev/null
+++ b/units/user.slice
@@ -0,0 +1,13 @@
+# 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=User and Session Slice
+Documentation=man:systemd.special(7)
+
+[Install]
+WantedBy=slices.target