Merge pull request #12 from Gottox/fix-musl-228.1

Merged: 228.1: fix musl

diff --git a/configure.ac b/configure.ac
index 5b31470edfe935f94c5b42c9ede3696fcaee17cb..5b4520a643d8f3ec8907aa63093b86f6c4e3cdb2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([elogind],
-        [228.1],
+        [228.2],
         [https://github.com/elogind/elogind/issues],
         [elogind],
         [https://github.com/elogind/elogind])

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 209e62b676ad65f85b7e6b7f523f14785fb66780..82ab09be1090b15f6581da6dc51a784be5670d4f 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1532,6 +1532,10 @@ static int execute_shutdown_or_sleep(
                         "ss", NULL, "replace-irreversibly");
 #else
         r = shutdown_or_sleep(m, action);
+
+        /* no more pending actions, whether this failed or not */
+        m->pending_action = HANDLE_IGNORE;
+        m->action_what    = 0;
 #endif // 0
         if (r < 0)
                 return r;