proxmox-mirrors/systemd
1
0
Fork 0
mirror of https://git.proxmox.com/git/systemd synced 2026-01-17 19:48:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

load-fragment: replace specifiers in path unit's Unit= setting

Browse Source
This commit is contained in:
Lennart Poettering 2013-01-15 21:37:17 +01:00
parent 7d0c710d72
commit 858c33bf60
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/load-fragment.c
View File

@ -1287,6 +1287,7 @@ int config_parse_path_unit(
int r;
DBusError error;
Unit *u;
_cleanup_free_ char *p = NULL;
assert(filename);
assert(lvalue);
@ -1295,13 +1296,18 @@ int config_parse_path_unit(
dbus_error_init(&error);
if (endswith(rvalue, ".path")) {
log_error("[%s:%u] Unit cannot be of type path, ignoring: %s", filename, line, rvalue);
p = unit_name_printf(u, rvalue);
if (!p)
return log_oom();
if (endswith(p, ".path")) {
log_error("[%s:%u] Unit cannot be of type path, ignoring: %s", filename, line, p);
return 0;
}
if ((r = manager_load_unit(UNIT(t)->manager, rvalue, NULL, &error, &u)) < 0) {
log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
r = manager_load_unit(UNIT(t)->manager, p, NULL, &error, &u);
if (r < 0) {
log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, p, bus_error(&error, r));
dbus_error_free(&error);
return 0;
}