From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 17 Jun 2013 22:59:54 +0000 (+0200)
Subject: units: add default units for system.slice, user.slice, machine.slice
X-Git-Tag: v205~115
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f2561e85982ed25b610cad6253599a051f9ec8e2

units: add default units for system.slice, user.slice, machine.slice
---

diff --git a/Makefile.am b/Makefile.am
index 5a285be34..f84236d8a 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 6b9cfe4c9..d7c68f4e2 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 000000000..6b1754b9d
--- /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 000000000..cbfdba005
--- /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 000000000..f78ecb438
--- /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 000000000..dfaa44bca
--- /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