systemd: remove patch that makes systemd-logind ignore KEY_POWER events

Without systemd, our KEY_POWER events were handled by the ACPI daemon, which in
turn issued a "poweroff" command. With systemd, the ACPI daemon is no longer
available and the events are handled by systemd-logind instead, which also
powers down the system properly. However, NXP added a patch that prevents
system-logind from handling the events, since they use the sc_powerkey instead.

Remove this patch to be able to power the target off via our power button.

https://jira.digi.com/browse/DEL-6415

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2019-02-01 13:14:43 +01:00
parent 97e762fe9f
commit 670491e287
2 changed files with 1 additions and 32 deletions

View File

@ -1,30 +0,0 @@
From ef9f6626d08d6d19767d20845c8d6f374f05465d Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Tue, 3 Apr 2018 14:07:32 -0500
Subject: [PATCH] logind.conf: Set HandlePowerKey to ignore
For i.MX, we don't want systemd to handle the power key.
Upstream-Status: Inappropriate [i.MX-specific]
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
src/login/logind.conf.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/login/logind.conf.in b/src/login/logind.conf.in
index 6f720b7..043191f 100644
--- a/src/login/logind.conf.in
+++ b/src/login/logind.conf.in
@@ -19,6 +19,8 @@
#KillExcludeUsers=root
#InhibitDelayMaxSec=5
#HandlePowerKey=poweroff
+# i.MX-specific
+HandlePowerKey=ignore
#HandleSuspendKey=suspend
#HandleHibernateKey=hibernate
#HandleLidSwitch=suspend
--
2.7.4

View File

@ -1,7 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://0020-logind.conf-Set-HandlePowerKey-to-ignore.patch \
file://0021-systemd-udevd.service.in-Set-MountFlags-as-shared-to.patch \
SRC_URI += "file://0021-systemd-udevd.service.in-Set-MountFlags-as-shared-to.patch \
file://0001-socket-util-fix-getpeergroups-assert-fd-8080.patch \
"