From 2327b6efdbfd06a2eff87b25fe549522df824e0a Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Mon, 20 Mar 2023 18:39:30 +0100 Subject: [PATCH] main/postmarketos-bootsplash: allow skip shutdown splash (MR 3970) deviceinfo allows to disable the framebuffer which automatically skips the splash on boot. Honor this setting as well for the shutdown splash. Also honor the PMOS_NOSPLASH cmdline parameter as well. [ci:skip-build]: already built successfully in CI --- main/postmarketos-bootsplash/99-shutdown-pbsplash.stop | 10 ++++++++++ main/postmarketos-bootsplash/APKBUILD | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/main/postmarketos-bootsplash/99-shutdown-pbsplash.stop b/main/postmarketos-bootsplash/99-shutdown-pbsplash.stop index 16b2d4f6e..8e09f6f35 100644 --- a/main/postmarketos-bootsplash/99-shutdown-pbsplash.stop +++ b/main/postmarketos-bootsplash/99-shutdown-pbsplash.stop @@ -5,6 +5,16 @@ VT=7 # Retrieve device name source /etc/deviceinfo +# Do not show splash if framebuffer is disabled +if [ "$deviceinfo_no_framebuffer" = "true" ]; then + return; +fi + +# Do not show splash if PMOS_SPLASH is set +if grep -q PMOS_NOSPLASH /proc/cmdline; then + return; +fi + # Run on separate VT to avoid interference of display managers chvt "$VT" diff --git a/main/postmarketos-bootsplash/APKBUILD b/main/postmarketos-bootsplash/APKBUILD index f0f0acdd4..f006feec5 100644 --- a/main/postmarketos-bootsplash/APKBUILD +++ b/main/postmarketos-bootsplash/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Caleb Connolly pkgname=postmarketos-bootsplash pkgver=0.2 -pkgrel=2 +pkgrel=3 pkgdesc="pmOS integration components for pbsplash" url="https://postmarketos.org" arch="all" @@ -37,7 +37,7 @@ openrc() { sha512sums=" 7e5416f0f9de3605dcbc5ddd4b93d244fd6d4fd1bc2d5a15a034263f8517fc51e73509f29f2a13397d059913917990ada89b36ac7b00a0d21c0283fade755c1c kill-pbsplash -c9828e82bbe9d768bfbc289ab14c8e3c56f56f866c5fece63f843963644a85f6ed390be08601a3776171b1b660435def53bd12ae4e59d7a66495306ca794f27d 99-shutdown-pbsplash.stop +81b54cbf806fe36a338ccc79e370e05e721d5d19de2d8905cf3bfc502e3041fb0b3b5429d5c1bf8d9a238838a1cce704c3683cf054d15a25d43681e30280395a 99-shutdown-pbsplash.stop 2387c64d84f0ba3ee76925f55c87ce025140aa3cd462107a851c34ffd89bd52f606e0d1f9f371d4f642d96545d5cc1bc0fcfb23ca7629a9149055f068da6bffd OpenSans-Regular.svg 98984fd67b99400d2b08422c4d314da558d3c94ee67dbc895e7bbfd6fdf22d4b2c9d35f48f4b73b383a054f535d4089fb705c5532f034cb2ee54eab2184e8e86 pmos-logo.svg 1940480fb98ffd1cef17c0ed440d44aa200119d022ce59973a18fa39ee040b19e748312ae61edae4ff8d2bacf42b4d7c9144274b99cd8563e4a106447825b8f2 pmos-logo-text.svg