diff options
| -rw-r--r-- | src/core/manager.c | 9 | ||||
| -rw-r--r-- | src/shared/path-lookup.c | 24 |
2 files changed, 15 insertions, 18 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 25aa1be12f..c8d7d70dc4 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2263,7 +2263,8 @@ static int create_generator_dir(Manager *m, char **generator, const char *name) r = mkdir_p_label(p, 0755); if (r < 0) { - log_error("Failed to create generator directory: %s", strerror(-r)); + log_error("Failed to create generator directory %s: %s", + p, strerror(-r)); free(p); return r; } @@ -2274,7 +2275,8 @@ static int create_generator_dir(Manager *m, char **generator, const char *name) if (!mkdtemp(p)) { free(p); - log_error("Failed to create generator directory: %m"); + log_error("Failed to create generator directory %s: %m", + p); return -errno; } } @@ -2313,7 +2315,8 @@ void manager_run_generators(Manager *m) { if (errno == ENOENT) return; - log_error("Failed to enumerate generator directory: %m"); + log_error("Failed to enumerate generator directory %s: %m", + generator_path); return; } diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index 8ee9ddc9c6..fa4995ceea 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -239,7 +239,6 @@ int lookup_paths_init( const char *generator_late) { const char *e; - char *t; assert(p); @@ -318,14 +317,12 @@ int lookup_paths_init( strv_uniq(p->unit_path); if (!strv_isempty(p->unit_path)) { - - t = strv_join(p->unit_path, "\n\t"); + char _cleanup_free_ *t = strv_join(p->unit_path, "\n\t"); if (!t) return -ENOMEM; - log_debug("Looking for unit files in:\n\t%s", t); - free(t); + log_info("Looking for unit files in (higher priority first):\n\t%s", t); } else { - log_debug("Ignoring unit files."); + log_info("Ignoring unit files."); strv_free(p->unit_path); p->unit_path = NULL; } @@ -380,33 +377,30 @@ int lookup_paths_init( strv_uniq(p->sysvrcnd_path); if (!strv_isempty(p->sysvinit_path)) { - - t = strv_join(p->sysvinit_path, "\n\t"); + char _cleanup_free_ *t = strv_join(p->sysvinit_path, "\n\t"); if (!t) return -ENOMEM; - log_debug("Looking for SysV init scripts in:\n\t%s", t); - free(t); + log_info("Looking for SysV init scripts in:\n\t%s", t); } else { - log_debug("Ignoring SysV init scripts."); + log_info("Ignoring SysV init scripts."); strv_free(p->sysvinit_path); p->sysvinit_path = NULL; } if (!strv_isempty(p->sysvrcnd_path)) { - - t = strv_join(p->sysvrcnd_path, "\n\t"); + char _cleanup_free_ *t = + strv_join(p->sysvrcnd_path, "\n\t"); if (!t) return -ENOMEM; log_debug("Looking for SysV rcN.d links in:\n\t%s", t); - free(t); } else { log_debug("Ignoring SysV rcN.d links."); strv_free(p->sysvrcnd_path); p->sysvrcnd_path = NULL; } #else - log_debug("Disabled SysV init scripts and rcN.d links support"); + log_info("SysV init scripts and rcN.d links support disabled"); #endif } |