From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 28 Jan 2019 17:47:01 +0000 (+0100)
Subject: systemctl: drop arg_esp_path variable from systemctl
X-Git-Tag: v242-rc1~218^2~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=947fbaea8bb77085114db2e855553448c8c0d248;p=thirdparty%2Fsystemd.git

systemctl: drop arg_esp_path variable from systemctl

It's not set ever (and there's no real need to make it settable, since
users can as well set $SYSTEMD_ESP_PATH to configure this.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 6900f61e9e5..bca1b79bab3 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -134,7 +134,6 @@ static const char *arg_kill_who = NULL;
 static int arg_signal = SIGTERM;
 static char *arg_root = NULL;
 static usec_t arg_when = 0;
-static char *arg_esp_path = NULL;
 static char *argv_cmdline = NULL;
 static enum action {
         ACTION_SYSTEMCTL,
@@ -3532,7 +3531,7 @@ static int load_kexec_kernel(void) {
         if (access(KEXEC, X_OK) < 0)
                 return log_error_errno(errno, KEXEC" is not available: %m");
 
-        r = find_default_boot_entry(arg_esp_path, &config, &e);
+        r = find_default_boot_entry(NULL, &config, &e);
         if (r == -ENOKEY) /* find_default_boot_entry() doesn't warn about this case */
                 return log_error_errno(r, "Cannot find the ESP partition mount point.");
         if (r < 0)
@@ -8814,7 +8813,6 @@ finish:
 
         strv_free(arg_wall);
         free(arg_root);
-        free(arg_esp_path);
 
         /* Note that we return r here, not 0, so that we can implement the LSB-like return codes */
         return r;