diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-02 10:21:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-02 10:21:29 +0200 |
commit | 4e561c6200fc67b6e7715ef9802868f645d024f3 (patch) | |
tree | d5309f1012e98d1117653e33a379105c094588b3 /units | |
parent | 61fd7d6720c562c88ab79062ff8d131e5e3c7b1b (diff) | |
parent | 20f938ff7f8777ee9f4fab1dc1ac80e7ce2883e1 (diff) | |
download | systemd-4e561c6200fc67b6e7715ef9802868f645d024f3.tar.gz |
Merge pull request #15109 from keszybz/units-make-installable
Make homed/userdbd/repart services installable (to allow uninstalling)
Diffstat (limited to 'units')
-rw-r--r-- | units/meson.build | 9 | ||||
-rw-r--r-- | units/systemd-homed.service.in | 4 | ||||
-rw-r--r-- | units/systemd-repart.service.in | 6 | ||||
-rw-r--r-- | units/systemd-userdbd.service.in | 3 | ||||
-rw-r--r-- | units/systemd-userdbd.socket | 3 |
5 files changed, 18 insertions, 7 deletions
diff --git a/units/meson.build b/units/meson.build index ea91f0cc9e..8ec9eb94e4 100644 --- a/units/meson.build +++ b/units/meson.build @@ -139,8 +139,7 @@ units = [ 'sysinit.target.wants/'], ['systemd-udevd-kernel.socket', '', 'sockets.target.wants/'], - ['systemd-userdbd.socket', 'ENABLE_USERDB', - 'sockets.target.wants/'], + ['systemd-userdbd.socket', 'ENABLE_USERDB'], ['time-set.target', ''], ['time-sync.target', ''], ['timers.target', ''], @@ -201,8 +200,7 @@ in_units = [ ['systemd-portabled.service', 'ENABLE_PORTABLED', 'dbus-org.freedesktop.portable1.service'], ['systemd-userdbd.service', 'ENABLE_USERDB'], - ['systemd-homed.service', 'ENABLE_HOMED', - 'multi-user.target.wants/ dbus-org.freedesktop.home1.service'], + ['systemd-homed.service', 'ENABLE_HOMED'], ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', 'sysinit.target.wants/'], @@ -228,8 +226,7 @@ in_units = [ 'multi-user.target.wants/'], ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], ['systemd-volatile-root.service', ''], - ['systemd-repart.service', 'ENABLE_REPART', - 'sysinit.target.wants/ initrd-root-fs.target.wants/'], + ['systemd-repart.service', 'ENABLE_REPART'], ['user-runtime-dir@.service', ''], ['user@.service', ''], ] diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in index 6490f48a15..91dabee034 100644 --- a/units/systemd-homed.service.in +++ b/units/systemd-homed.service.in @@ -34,3 +34,7 @@ SystemCallArchitectures=native SystemCallErrorNumber=EPERM SystemCallFilter=@system-service @mount @SERVICE_WATCHDOG@ + +[Install] +WantedBy=multi-user.target +Alias=dbus-org.freedesktop.home1.service diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in index 7ce6aefd29..41a9d82b93 100644 --- a/units/systemd-repart.service.in +++ b/units/systemd-repart.service.in @@ -21,5 +21,9 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootbindir@/systemd-repart --dry-run=no -# The tool returns 77 if there's no GPT partition table pre-existing +# The tool returns 77 if there's no existing GPT partition table SuccessExitStatus=77 + +[Install] +WantedBy=sysinit.target +WantedBy=initrd-root-fs.target diff --git a/units/systemd-userdbd.service.in b/units/systemd-userdbd.service.in index e30ed2109e..3b76705373 100644 --- a/units/systemd-userdbd.service.in +++ b/units/systemd-userdbd.service.in @@ -39,3 +39,6 @@ SystemCallErrorNumber=EPERM SystemCallFilter=@system-service Type=notify @SERVICE_WATCHDOG@ + +[Install] +Also=systemd-userdbd.socket diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket index 1c749ea1d2..2b4bb7a87a 100644 --- a/units/systemd-userdbd.socket +++ b/units/systemd-userdbd.socket @@ -17,3 +17,6 @@ Before=sockets.target ListenStream=/run/systemd/userdb/io.systemd.Multiplexer Symlinks=/run/systemd/userdb/io.systemd.NameServiceSwitch SocketMode=0666 + +[Install] +WantedBy=sockets.target |