From 9ae26cfeea354039c1bdb42fb7289be55115681d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 22 Jan 2020 14:20:24 +0000 Subject: psplash: add systemd support Make use of the recently added systemd support in psplash. The utility psplash-systemd communicates boot progress to the splash screen. The splash is disabled once systemd consideres the system fully booted (progress is at 1.0). Note that this can take a while if systemd is stuck on a failing unit. This change adds two systemd services. One service starts psplash itself (psplash-start.service) and the second service starts the helper utility psplash-systemd (psplash-systemd.service). The units are written such that psplash-systemd.service can be used indepenendenly. This is useful when starting psplash in initramfs (not using systemd). (From OE-Core rev: b4063b16082604554c7c19b369ebddd27061f372) Signed-off-by: Stefan Agner Signed-off-by: Richard Purdie --- meta/recipes-core/psplash/files/psplash-init | 8 ++++---- meta/recipes-core/psplash/files/psplash-start.service | 10 ++++++++++ meta/recipes-core/psplash/files/psplash-systemd.service | 10 ++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-core/psplash/files/psplash-start.service create mode 100644 meta/recipes-core/psplash/files/psplash-systemd.service (limited to 'meta/recipes-core/psplash/files') diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 4bee866b0d..f58e043733 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -23,10 +23,10 @@ for x in $CMDLINE; do esac done -export TMPDIR=/mnt/.psplash -[ -d $TMPDIR ] || mkdir -p $TMPDIR -if ! mountpoint -q $TMPDIR; then - mount tmpfs -t tmpfs $TMPDIR -o,size=40k +export PSPLASH_FIFO_DIR=/mnt/.psplash +[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR +if ! mountpoint -q $PSPLASH_FIFO_DIR; then + mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k fi rotation=0 diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service new file mode 100644 index 0000000000..9de8f6321a --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash boot splash screen +DefaultDependencies=no +Requires=psplash-systemd.service + +[Service] +ExecStart=/usr/bin/psplash + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service new file mode 100644 index 0000000000..e14f42032d --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=systemd-start.service + +[Service] +ExecStart=/usr/bin/psplash-systemd + +[Install] +WantedBy=sysinit.target -- cgit v1.2.3-54-g00ecf