picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: --user -- add basic.target an sort against it like --system does

Browse source
This commit is contained in:
Kay Sievers 2014-01-06 07:52:17 +04:00
parent fcc81ea361
commit fccd44ec3a
4 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -460,6 +460,7 @@ nodist_systemunit_DATA = \
units/systemd-nspawn@.service
dist_userunit_DATA = \
units/user/basic.target \
units/user/default.target \
units/user/exit.target

26
src/core/service.c
View file

@ -1138,28 +1138,10 @@ static int service_add_default_dependencies(Service *s) {
* majority of services. */
/* First, pull in base system */
if (UNIT(s)->manager->running_as == SYSTEMD_SYSTEM) {
r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES,
SPECIAL_BASIC_TARGET, NULL, true);
if (r < 0)
return r;
} else if (UNIT(s)->manager->running_as == SYSTEMD_USER) {
r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES,
SPECIAL_SOCKETS_TARGET, NULL, true);
if (r < 0)
return r;
r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES,
SPECIAL_TIMERS_TARGET, NULL, true);
if (r < 0)
return r;
r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES,
SPECIAL_PATHS_TARGET, NULL, true);
if (r < 0)
return r;
}
r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES,
SPECIAL_BASIC_TARGET, NULL, true);
if (r < 0)
return r;
/* Second, activate normal shutdown */
r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS,

13
units/user/basic.target 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=Basic System
Documentation=man:systemd.special(7)
Wants=sockets.target timers.target paths.target
After=sockets.target timers.target paths.target
RefuseManualStart=yes

2
units/user/default.target
View file

@ -8,4 +8,6 @@
[Unit]
Description=Default
Documentation=man:systemd.special(7)
Requires=basic.target
After=basic.target
AllowIsolate=yes