shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 10:25:06 +03:00
Code

manager: recheck unit paths on daemon reload

Browse Source
This commit is contained in:
Lennart Poettering 2010-06-15 14:32:26 +02:00
parent 479ef5d398
commit 2ded0c0442
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/manager.c
View File

@ -241,6 +241,12 @@ static int manager_find_paths(Manager *m) {
assert(m);
/* Unset previous data, in case we are called on reload */
strv_free(m->unit_path);
strv_free(m->sysvinit_path);
strv_free(m->sysvrcnd_path);
m->unit_path = m->sysvinit_path = m->sysvrcnd_path = NULL;
/* First priority is whatever has been passed to us via env
* vars */
if ((e = getenv("SYSTEMD_UNIT_PATH")))
@ -2346,6 +2352,10 @@ int manager_reload(Manager *m) {
/* From here on there is no way back. */
manager_clear_jobs_and_units(m);
/* Find new unit paths */
if ((q = manager_find_paths(m)) < 0)
r = q;
/* First, enumerate what we can from all config files */
if ((q = manager_enumerate(m)) < 0)
r = q;

1
src/systemctl.c
View File

@ -1397,7 +1397,6 @@ static int parse_argv(int argc, char *argv[]) {
int main(int argc, char*argv[]) {
static const struct {
const char* verb;
const enum {