diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-07 15:43:59 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-12 13:43:32 +0200 |
| commit | 4f4afc88ecd8ab9cfe9e1eeea7e3aeb937811937 (patch) | |
| tree | b6463bfed0cbe018a0eae715b28f539fbff848b6 /src/core/slice.c | |
| parent | 80b1ae32e1cab924086bb5224cde675df623df07 (diff) | |
core: rework how transient unit files and property drop-ins work
With this change the logic for placing transient unit files and drop-ins
generated via "systemctl set-property" is reworked.
The latter are now placed in the newly introduced "control" unit file
directory. The fomer are now placed in the "transient" unit file directory.
Note that the properties originally set when a transient unit was created will
be written to and stay in the transient unit file directory, while later
changes are done via drop-ins.
This is preparation for a later "systemctl revert" addition, where existing
drop-ins are flushed out, but the original transient definition is restored.
Diffstat (limited to 'src/core/slice.c')
| -rw-r--r-- | src/core/slice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/slice.c b/src/core/slice.c index 667f61bde5..63a77c9bca 100644 --- a/src/core/slice.c +++ b/src/core/slice.c @@ -135,6 +135,7 @@ static int slice_load(Unit *u) { int r; assert(s); + assert(u->load_state == UNIT_STUB); r = unit_load_fragment_and_dropin_optional(u); if (r < 0) |