debug-generator: respect kernel parameters for default unit setting
This commit is contained in:
parent
e2c9a13136
commit
7dcc56715d
|
@ -23,11 +23,13 @@
|
|||
#include "mkdir.h"
|
||||
#include "parse-util.h"
|
||||
#include "proc-cmdline.h"
|
||||
#include "special.h"
|
||||
#include "string-util.h"
|
||||
#include "strv.h"
|
||||
#include "unit-name.h"
|
||||
#include "util.h"
|
||||
|
||||
static char *arg_default_unit = NULL;
|
||||
static const char *arg_dest = "/tmp";
|
||||
static char **arg_mask = NULL;
|
||||
static char **arg_wants = NULL;
|
||||
|
@ -80,6 +82,24 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
|
|||
arg_debug_shell = r;
|
||||
} else
|
||||
arg_debug_shell = true;
|
||||
} else if (streq(key, "systemd.unit")) {
|
||||
|
||||
if (!value)
|
||||
log_error("Missing argument for systemd.unit= kernel command line parameter.");
|
||||
else {
|
||||
r = free_and_strdup(&arg_default_unit, value);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to set default unit %s: %m", value);
|
||||
}
|
||||
} else if (!value) {
|
||||
const char *target;
|
||||
|
||||
target = runlevel_to_target(key);
|
||||
if (target) {
|
||||
r = free_and_strdup(&arg_default_unit, target);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to set default unit %s: %m", target);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -118,7 +138,7 @@ static int generate_wants_symlinks(void) {
|
|||
STRV_FOREACH(u, arg_wants) {
|
||||
_cleanup_free_ char *p = NULL, *f = NULL;
|
||||
|
||||
p = strjoin(arg_dest, "/default.target.wants/", *u, NULL);
|
||||
p = strjoin(arg_dest, "/", arg_default_unit, ".wants/", *u, NULL);
|
||||
if (!p)
|
||||
return log_oom();
|
||||
|
||||
|
@ -154,6 +174,12 @@ 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);
|
||||
if (r < 0)
|
||||
log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
|
||||
|
|
Loading…
Reference in a new issue