From 2ded0c0442f597dc397f7b0e9a15cf453578d11e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 15 Jun 2010 14:32:26 +0200 Subject: manager: recheck unit paths on daemon reload --- src/manager.c | 10 ++++++++++ src/systemctl.c | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/manager.c b/src/manager.c index 38964939c3..b4b963a662 100644 --- a/src/manager.c +++ b/src/manager.c @@ -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; diff --git a/src/systemctl.c b/src/systemctl.c index b0fb7b24ae..be32b0d152 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -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 { -- cgit v1.2.3-54-g00ecf