diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-12-18 13:20:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-18 13:20:12 +0100 |
| commit | 8b35656c33cca5e8d0a71d651954f2ae9f0dce24 (patch) | |
| tree | b915261dea4a8e2891768a1e7a6aaf947739d1d6 /src/debug-generator/debug-generator.c | |
| parent | 117d5a27a3480fd9729cfadd98d135d21732a88d (diff) | |
| parent | 5b5688afbe8125af23231ca221c822be0edc3f6e (diff) | |
Merge pull request #4911 from keszybz/fixlets
A few simple fixes / improvements
Diffstat (limited to 'src/debug-generator/debug-generator.c')
| -rw-r--r-- | src/debug-generator/debug-generator.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c index 1ee3471355..28ebe36b38 100644 --- a/src/debug-generator/debug-generator.c +++ b/src/debug-generator/debug-generator.c @@ -135,8 +135,9 @@ static int generate_wants_symlinks(void) { STRV_FOREACH(u, arg_wants) { _cleanup_free_ char *p = NULL, *f = NULL; + const char *target = arg_default_unit ?: SPECIAL_DEFAULT_TARGET; - p = strjoin(arg_dest, "/", arg_default_unit, ".wants/", *u); + p = strjoin(arg_dest, "/", target, ".wants/", *u); if (!p) return log_oom(); @@ -172,12 +173,6 @@ int main(int argc, char *argv[]) { umask(0022); - r = free_and_strdup(&arg_default_unit, SPECIAL_DEFAULT_TARGET); - if (r < 0) { - log_error_errno(r, "Failed to set default unit %s: %m", SPECIAL_DEFAULT_TARGET); - goto finish; - } - r = parse_proc_cmdline(parse_proc_cmdline_item, NULL, false); if (r < 0) log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m"); @@ -197,6 +192,7 @@ int main(int argc, char *argv[]) { r = q; finish: - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + arg_default_unit = mfree(arg_default_unit); + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; } |