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

path-lookup: make inclusion of user private units optional

Browse source
This commit is contained in:
Lennart Poettering 2011-07-22 04:17:38 +02:00
parent d8eaa1144f
commit c800e48374
4 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/manager.c
View file

@ -258,7 +258,7 @@ int manager_new(ManagerRunningAs running_as, Manager **_m) {
if ((m->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
goto fail;
if ((r = lookup_paths_init(&m->lookup_paths, m->running_as)) < 0)
if ((r = lookup_paths_init(&m->lookup_paths, m->running_as, true)) < 0)
goto fail;
if ((r = manager_setup_signals(m)) < 0)
@ -2822,7 +2822,7 @@ int manager_reload(Manager *m) {
/* Find new unit paths */
lookup_paths_free(&m->lookup_paths);
if ((q = lookup_paths_init(&m->lookup_paths, m->running_as)) < 0)
if ((q = lookup_paths_init(&m->lookup_paths, m->running_as, true)) < 0)
r = q;
manager_run_generators(m);

25
src/path-lookup.c
View file

@ -163,7 +163,7 @@ fail:
goto finish;
}
int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as, bool personal) {
const char *e;
char *t;
@ -181,8 +181,27 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
strv_free(p->unit_path);
if (running_as == MANAGER_USER) {
if (!(p->unit_path = user_dirs()))
if (personal)
p->unit_path = user_dirs();
else
p->unit_path = strv_new(
/* If you modify this you also want to modify
* systemduserunitpath= in systemd.pc.in, and
* the arrays in user_dirs() above! */
"/run/systemd/user",
USER_CONFIG_UNIT_PATH,
"/etc/systemd/system",
"/usr/local/lib/systemd/user",
"/usr/local/share/systemd/user",
USER_DATA_UNIT_PATH,
"/usr/lib/systemd/user",
"/usr/share/systemd/user",
NULL);
if (!p->unit_path)
return -ENOMEM;
} else
if (!(p->unit_path = strv_new(
/* If you modify this you also want to modify
@ -192,8 +211,8 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as) {
"/etc/systemd/system",
"/usr/local/lib/systemd/system",
"/usr/lib/systemd/system",
"/lib/systemd/system",
SYSTEM_DATA_UNIT_PATH,
"/lib/systemd/system",
NULL)))
return -ENOMEM;
}

2
src/path-lookup.h
View file

@ -34,7 +34,7 @@ typedef struct LookupPaths {
int user_config_home(char **config_home);
int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as);
int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as, bool personal);
void lookup_paths_free(LookupPaths *p);
#endif

2
src/systemctl.c
View file

@ -4139,7 +4139,7 @@ static int enable_unit(DBusConnection *bus, char **args, unsigned n) {
dbus_error_init(&error);
zero(paths);
if ((r = lookup_paths_init(&paths, arg_user ? MANAGER_USER : MANAGER_SYSTEM)) < 0) {
if ((r = lookup_paths_init(&paths, arg_user ? MANAGER_USER : MANAGER_SYSTEM, true)) < 0) {
log_error("Failed to determine lookup paths: %s", strerror(-r));
goto finish;
}