forked from pool/systemd
b8b836245b
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/request/show/149703 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
Index: systemd-195/src/systemctl/systemctl.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/systemctl/systemctl.c
|
|
+++ systemd-195/src/systemctl/systemctl.c
|
|
@@ -5239,6 +5239,7 @@ static int runlevel_main(void) {
|
|
|
|
int main(int argc, char*argv[]) {
|
|
int r, retval = EXIT_FAILURE;
|
|
+ char **to_free = NULL;
|
|
DBusConnection *bus = NULL;
|
|
DBusError error;
|
|
|
|
@@ -5247,6 +5248,27 @@ int main(int argc, char*argv[]) {
|
|
log_parse_environment();
|
|
log_open();
|
|
|
|
+ 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;
|
|
+ }
|
|
+ }
|
|
+
|
|
r = parse_argv(argc, argv);
|
|
if (r < 0)
|
|
goto finish;
|
|
@@ -5348,6 +5370,8 @@ finish:
|
|
|
|
strv_free(arg_property);
|
|
|
|
+ strv_free(to_free);
|
|
+
|
|
pager_close();
|
|
ask_password_agent_close();
|
|
polkit_agent_close();
|