From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Mon, 10 Sep 2018 18:53:59 +0000 (+0100)
Subject: Revert "systemctl: fix compilation w/o logind"
X-Git-Tag: v240~733^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f56c3d46efeb15d6e1b440bbc10f0643fdbee5f;p=thirdparty%2Fsystemd.git

Revert "systemctl: fix compilation w/o logind"

This reverts commit 807690fb7f7e4998e2bb67f32026ab9f1c7b8077.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 9ddd40a48e3..ff204cd789c 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -8509,8 +8509,8 @@ static int halt_now(enum action a) {
         }
 }
 
-#if ENABLE_LOGIND
 static int logind_schedule_shutdown(void) {
+
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         char date[FORMAT_TIMESTAMP_MAX];
         const char *action;
@@ -8563,7 +8563,6 @@ static int logind_schedule_shutdown(void) {
                 log_info("Shutdown scheduled for %s, use 'shutdown -c' to cancel.", format_timestamp(date, sizeof(date), arg_when));
         return 0;
 }
-#endif
 
 static int halt_main(void) {
         int r;