postmarketos-mkinitfs: skip fbsplash for deviceinfo_no_framebuffer (!108)

Also noticed that the debug-shell hook wasn't sourcing the deviceinfo
and still showing the splashscreen even with
deviceinfo_no_framebuffer="true", now is fixed and tested.

Additionally, fix a typo in the existing
"NOTE: Skipping framebuffer setup..." message.
This commit is contained in:
Daniele Debernardi
2018-12-26 20:21:55 +01:00
committed by Oliver Smith
parent 6d25c1bef6
commit a98b900b65
2 changed files with 10 additions and 3 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
pkgname=postmarketos-mkinitfs
pkgver=0.7.3
pkgrel=1
pkgrel=2
pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://postmarketos.org"
# multipath-tools: kpartx
@@ -25,5 +25,5 @@ package() {
}
sha512sums="c8ed2697ba0368b907eaefe7544bff8539adc7e8247af6bd425c722e3cedeb34e303f6bd9e00f283921352bc43dff3db83f3b3c1f427ef597ac15323f1e9c3eb init.sh.in
c012f1113854332709fd5f3b57fd005c51956357dd8ab6e8ae03138a4d8b11508095c6ea2dfc0f8a270947f0171f3268ddcd91672d9c4244a1692e7cb46d633b init_functions.sh
3c72a9a5cfef0591dd27c88a76df4db0f50b98f002672c061e77bdb2e6f4ac48d10b5cd85563a89d778a013da6d5a508e5ea70f131971d61545ba18e7094ab8b init_functions.sh
4c8a999009bc7e909bc1848c8c2421cb5f79f2603ee210b8f8c145f47c31a9e56e1861cffe742fcfd3c7bbb315e37dbe347bb5ac602f45eeccc0e40516889618 mkinitfs.sh"
+8 -1
View File
@@ -333,6 +333,13 @@ start_charging_mode(){
# $1: path to ppm.gz file
show_splash() {
# Skip for non-framebuffer devices
# shellcheck disable=SC2154
if [ "$deviceinfo_no_framebuffer" = "true" ]; then
echo "NOTE: Skipping framebuffer splashscreen (deviceinfo_no_framebuffer)"
return
fi
gzip -c -d "$1" >/tmp/splash.ppm
fbsplash -s /tmp/splash.ppm
}
@@ -350,7 +357,7 @@ setup_framebuffer() {
# Skip for non-framebuffer devices
# shellcheck disable=SC2154
if [ "$deviceinfo_no_framebuffer" = "true" ]; then
echo "NOTE: Skipping framebuffer setup (deviecinfo_no_framebuffer)"
echo "NOTE: Skipping framebuffer setup (deviceinfo_no_framebuffer)"
return
fi