Index: systemd-195/src/systemctl/systemctl.c =================================================================== --- systemd-195.orig/src/systemctl/systemctl.c +++ systemd-195/src/systemctl/systemctl.c @@ -4118,10 +4118,32 @@ static int systemctl_parse_argv(int argc }; int c; + char **to_free = NULL; assert(argc >= 0); assert(argv); + if (secure_getenv("SYSTEMCTL_OPTIONS")) { + char **parsed_systemctl_options = strv_split_quoted(getenv("SYSTEMCTL_OPTIONS")); + + if (*parsed_systemctl_options && **parsed_systemctl_options) { + char **k,**a; + char **new_argv = new(char*, strv_length(argv) + strv_length(parsed_systemctl_options) + 1); + new_argv[0] = strdup(argv[0]); + for (k = new_argv+1, a = parsed_systemctl_options; *a; k++, a++) { + *k = strdup(*a); + } + for (a = argv+1; *a; k++, a++) { + *k = strdup(*a); + } + *k = NULL; + argv = new_argv; + argc = strv_length(new_argv); + strv_free (parsed_systemctl_options); + to_free = new_argv; + } + } + while ((c = getopt_long(argc, argv, "ht:p:aqfs:H:Pn:o:", options, NULL)) >= 0) { switch (c) { @@ -4297,6 +4319,8 @@ static int systemctl_parse_argv(int argc return -EINVAL; } + strv_free(to_free); + return 1; }