File 0001-Revert-handle-SYSTEMCTL_OPTIONS-environmen... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-handle-SYSTEMCTL_OPTIONS-environment-variable.patch of Package systemd (Revision 931b72fd68efece0853d602f4f583d40)

Currently displaying revision 931b72fd68efece0853d602f4f583d40 , Show latest

From f9eccd4cf4984891971994bdc62d5ce47f427003 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 28 Dec 2017 12:00:47 +0100
Subject: [PATCH 1/1] Revert "handle SYSTEMCTL_OPTIONS environment variable"

This reverts commit 03f9ba4ad7678c45c9809180fd35573e64eaebdf.

[fbui: fate#323393]
---
 src/systemctl/systemctl.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index e7b51812c..83ed9ef9f 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -8546,31 +8546,6 @@ int main(int argc, char*argv[]) {
          * ellipsized. */
         original_stdout_is_tty = isatty(STDOUT_FILENO);
 
-        if (secure_getenv("SYSTEMCTL_OPTIONS") &&
-                        (!program_invocation_short_name ||
-                        (program_invocation_short_name && strstr(program_invocation_short_name, "systemctl")))) {
-                char **parsed_systemctl_options;
-
-                strv_split_extract(&parsed_systemctl_options, getenv("SYSTEMCTL_OPTIONS"),
-                                   WHITESPACE, EXTRACT_QUOTES);
-
-                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);
-                }
-        }
-
         r = parse_argv(argc, argv);
         if (r <= 0)
                 goto finish;
-- 
2.15.1

Places

File 0001-Revert-handle-SYSTEMCTL_OPTIONS-environment-variable.patch of Package systemd (Revision 931b72fd68efece0853d602f4f583d40)

Places