From 7b58ed7fce3519c426cb684c3f18a32b11cda9a2 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Wed, 19 Aug 2020 13:19:50 +0200 Subject: [PATCH] main/postmarketos-base: stop the power key from shutting down devices (MR 1499) Pressing power button should not power off a device. Although it is expected on desktops and laptops, it isn't expected on phones and tablets. Instead it should just turn off the screen or go into a deep sleep, but that isn't handled by elogind. So let elogind just ignore the button altogether. Also re-order the dependencies alphabetically while we're touching the package anyway --- main/postmarketos-base/APKBUILD | 14 ++++++++++---- .../postmarketos-base-elogind.post-install | 7 +++++++ .../postmarketos-base.post-install | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 main/postmarketos-base/postmarketos-base-elogind.post-install diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD index 28db3ea11..6683fb446 100644 --- a/main/postmarketos-base/APKBUILD +++ b/main/postmarketos-base/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-base pkgver=3 -pkgrel=36 +pkgrel=37 pkgdesc="Meta package for minimal postmarketOS base" url="https://postmarketos.org" arch="noarch" @@ -11,17 +11,17 @@ depends=" cryptsetup eudev haveged + networkmanager openssh postmarketos-mkinitfs + shadow sudo util-linux wpa_supplicant - shadow - networkmanager " install="$pkgname.post-install" triggers="$pkgname.trigger=/etc" -subpackages="$pkgname-x11" +subpackages="$pkgname-x11 $pkgname-elogind" source=" firmwareload.sh 50-firmware.rules @@ -73,6 +73,12 @@ x11() { mkdir "$subpkgdir" } +elogind() { + install_if="$pkgname elogind" + install="$subpkgname.post-install" + mkdir "$subpkgdir" +} + sha512sums="38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b24f45302a0726fdc1cf253aecaac140f431735ac5c6511553f790badd0af firmwareload.sh 0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d 50-firmware.rules 67a031f309a3232ac1e8abc3fedeaee912c035f9c81b4f709248895905a27ab5844ec92c65e55b79af3894450ba3883549d4004f11efebb47114d41f730e4a5f networkmanager.conf diff --git a/main/postmarketos-base/postmarketos-base-elogind.post-install b/main/postmarketos-base/postmarketos-base-elogind.post-install new file mode 100644 index 000000000..37ad14027 --- /dev/null +++ b/main/postmarketos-base/postmarketos-base-elogind.post-install @@ -0,0 +1,7 @@ +#!/bin/sh + +# Stop the power key from powering down the device +echo "- Modifying: /etc/elogind/logind.conf" +sed -i 's/#HandlePowerKey=poweroff/HandlePowerKey=ignore/' /etc/elogind/logind.conf + +exit 0 diff --git a/main/postmarketos-base/postmarketos-base.post-install b/main/postmarketos-base/postmarketos-base.post-install index f36a71b19..866276389 100644 --- a/main/postmarketos-base/postmarketos-base.post-install +++ b/main/postmarketos-base/postmarketos-base.post-install @@ -86,3 +86,4 @@ if grep -q "^initstepslew" /etc/chrony/chrony.conf; then fi exit 0 +