diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-07-02 03:47:23 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-07-02 03:47:23 +0200 |
| commit | 1ee306e1248866617c96ed9f4263f375588ad838 (patch) | |
| tree | ebcb5678d4236ea8a8afc30c6164a4b4f51a03bd /units | |
| parent | 374ec6abf31ada6ca554cc8ea99b282373fac010 (diff) | |
machined: split out machine registration stuff from logind
Embedded folks don't need the machine registration stuff, hence it's
nice to make this optional. Also, I'd expect that machinectl will grow
additional commands quickly, for example to join existing containers and
suchlike, hence it's better keeping that separate from loginctl.
Diffstat (limited to 'units')
| -rw-r--r-- | units/.gitignore | 1 | ||||
| -rw-r--r-- | units/systemd-logind.service.in | 4 | ||||
| -rw-r--r-- | units/systemd-machined.service.in | 19 |
3 files changed, 22 insertions, 2 deletions
diff --git a/units/.gitignore b/units/.gitignore index 878cf2ce4c..0bcbb00951 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -57,3 +57,4 @@ /initrd-switch-root.service /initrd-udevadm-cleanup-db.service /systemd-nspawn@.service +/systemd-machined.service diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in index ec05e670f3..c4611e8492 100644 --- a/units/systemd-logind.service.in +++ b/units/systemd-logind.service.in @@ -9,8 +9,8 @@ Description=Login Service Documentation=man:systemd-logind.service(8) man:logind.conf(5) Documentation=http://www.freedesktop.org/wiki/Software/systemd/multiseat -Wants=user.slice machine.slice -After=nss-user-lookup.target user.slice machine.slice +Wants=user.slice +After=nss-user-lookup.target user.slice [Service] ExecStart=@rootlibexecdir@/systemd-logind diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in new file mode 100644 index 0000000000..334c622a17 --- /dev/null +++ b/units/systemd-machined.service.in @@ -0,0 +1,19 @@ +# 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 Registration Service +Documentation=man:systemd-machined.service(8) +Documentation=http://www.freedesktop.org/wiki/Software/systemd/machines +Wants=machine.slice +After=machine.slice + +[Service] +ExecStart=@rootlibexecdir@/systemd-machined +Restart=always +RestartSec=0 +BusName=org.freedesktop.machine1 |