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

load-fragment: Expand specifiers in conditions.

Browse source 
Add specifier expansion to Path and String conditions.

Specifier expansion for conditions will help create instance
and user session units by allowing us to template conditions
based on the instance or user session parameters.

An example would be a system-wide user session service file
that conditionally runs based on whether a user has the
service configured through a configuration file in ~/.config/.
This commit is contained in:
Auke Kok 2012-09-13 12:34:25 -07:00 committed by Lennart Poettering
parent 0675cc4a02
commit 095b2d7ab9
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/core/load-fragment.c
View file

@ -1469,6 +1469,7 @@ int config_parse_unit_condition_path(
Unit *u = data;
bool trigger, negate;
Condition *c;
char *p;
assert(filename);
assert(lvalue);
@ -1483,14 +1484,19 @@ int config_parse_unit_condition_path(
if (negate)
rvalue++;
if (!path_is_absolute(rvalue)) {
log_error("[%s:%u] Path in condition not absolute, ignoring: %s", filename, line, rvalue);
p = unit_full_printf(u, rvalue);
if (!p)
return -ENOMEM;
if (!path_is_absolute(p)) {
log_error("[%s:%u] Path in condition not absolute, ignoring: %s", filename, line, p);
return 0;
}
c = condition_new(cond, rvalue, trigger, negate);
c = condition_new(cond, p, trigger, negate);
if (!c)
return -ENOMEM;
free(p);
LIST_PREPEND(Condition, conditions, u->conditions, c);
return 0;
@ -1510,6 +1516,7 @@ int config_parse_unit_condition_string(
Unit *u = data;
bool trigger, negate;
Condition *c;
char *s;
assert(filename);
assert(lvalue);
@ -1524,9 +1531,14 @@ int config_parse_unit_condition_string(
if (negate)
rvalue++;
c = condition_new(cond, rvalue, trigger, negate);
s = unit_full_printf(u, rvalue);
if (!s)
return -ENOMEM;
c = condition_new(cond, s, trigger, negate);
if (!c)
return log_oom();
free(s);
LIST_PREPEND(Condition, conditions, u->conditions, c);
return 0;