chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix property changes in transient units
[elogind.git]
/
src
/
core
/
unit.c
diff --git
a/src/core/unit.c
b/src/core/unit.c
index 27d3be3860af7b46bc950ce52e88a7c07f7bbb82..d529638f86a300b75a7f10a552efb6b9a24dfcea 100644
(file)
--- a/
src/core/unit.c
+++ b/
src/core/unit.c
@@
-2860,7
+2860,6
@@
static int drop_in_file(Unit *u, UnitSetPropertiesMode mode, const char *name, c
assert(name);
assert(_p);
assert(_q);
assert(name);
assert(_p);
assert(_q);
- assert(mode & (UNIT_PERSISTENT|UNIT_RUNTIME));
b = xescape(name, "/.");
if (!b)
b = xescape(name, "/.");
if (!b)
@@
-2879,7
+2878,7
@@
static int drop_in_file(Unit *u, UnitSetPropertiesMode mode, const char *name, c
return -ENOENT;
p = strjoin(c, "/", u->id, ".d", NULL);
return -ENOENT;
p = strjoin(c, "/", u->id, ".d", NULL);
- } else if (mode
& UNIT_PERSISTENT
)
+ } else if (mode
== UNIT_PERSISTENT && !u->transient
)
p = strjoin("/etc/systemd/system/", u->id, ".d", NULL);
else
p = strjoin("/run/systemd/system/", u->id, ".d", NULL);
p = strjoin("/etc/systemd/system/", u->id, ".d", NULL);
else
p = strjoin("/run/systemd/system/", u->id, ".d", NULL);
@@
-2905,7
+2904,7
@@
int unit_write_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name, co
assert(name);
assert(data);
assert(name);
assert(data);
- if (!
(mode & (UNIT_PERSISTENT|UNIT_RUNTIME)
))
+ if (!
IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME
))
return 0;
r = drop_in_file(u, mode, name, &p, &q);
return 0;
r = drop_in_file(u, mode, name, &p, &q);
@@
-2925,7
+2924,7
@@
int unit_write_drop_in_format(Unit *u, UnitSetPropertiesMode mode, const char *n
assert(name);
assert(format);
assert(name);
assert(format);
- if (!
(mode & (UNIT_PERSISTENT|UNIT_RUNTIME)
))
+ if (!
IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME
))
return 0;
va_start(ap, format);
return 0;
va_start(ap, format);
@@
-2948,7
+2947,7
@@
int unit_write_drop_in_private(Unit *u, UnitSetPropertiesMode mode, const char *
if (!UNIT_VTABLE(u)->private_section)
return -EINVAL;
if (!UNIT_VTABLE(u)->private_section)
return -EINVAL;
- if (!
(mode & (UNIT_PERSISTENT|UNIT_RUNTIME)
))
+ if (!
IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME
))
return 0;
ndata = strjoin("[", UNIT_VTABLE(u)->private_section, "]\n", data, NULL);
return 0;
ndata = strjoin("[", UNIT_VTABLE(u)->private_section, "]\n", data, NULL);
@@
-2967,7
+2966,7
@@
int unit_write_drop_in_private_format(Unit *u, UnitSetPropertiesMode mode, const
assert(name);
assert(format);
assert(name);
assert(format);
- if (!
(mode & (UNIT_PERSISTENT|UNIT_RUNTIME)
))
+ if (!
IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME
))
return 0;
va_start(ap, format);
return 0;
va_start(ap, format);
@@
-2986,7
+2985,7
@@
int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name) {
assert(u);
assert(u);
- if (!
(mode & (UNIT_PERSISTENT|UNIT_RUNTIME)
))
+ if (!
IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME
))
return 0;
r = drop_in_file(u, mode, name, &p, &q);
return 0;
r = drop_in_file(u, mode, name, &p, &q);