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

This commit is contained in:
Lennart Poettering 2013-06-18 00:59:54 +02:00
parent a016b9228f
commit f2561e8598
6 changed files with 58 additions and 2 deletions

View file

@ -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

View file

@ -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

13
units/machine.slice Normal file
View file

@ -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

12
units/slices.target Normal file
View file

@ -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

11
units/system.slice Normal file
View file

@ -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

13
units/user.slice Normal file
View file

@ -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