summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2020-12-24 10:31:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-05 13:48:06 +0000
commitdc4065b6f101e6418301e0cb8d73ae3a1b2bdfb2 (patch)
tree33f57e11b038094a5583943942b006c51fa4643e
parent99206612a58e6b69718910e0806d9d36997b2fba (diff)
downloadopenembedded-core-contrib-dc4065b6f101e6418301e0cb8d73ae3a1b2bdfb2.tar.gz
PSPLASH_FIFO_DIR: refactor
Add an entry for the psplash fifo directory to /etc/default/rcS and have the pieces of code that need it source it from there rather than duplicating the definition in multiple places throughout the code. Signed-off-by: Trevor Woerner <twoerner@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-core/psplash/files/psplash-init4
-rwxr-xr-xmeta/recipes-core/sysvinit/sysvinit/rc5
-rw-r--r--meta/recipes-core/sysvinit/sysvinit/rcS-default2
3 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init
index f58e043733..e0f80bcdc0 100755
--- a/meta/recipes-core/psplash/files/psplash-init
+++ b/meta/recipes-core/psplash/files/psplash-init
@@ -7,6 +7,9 @@
# Default-Stop:
### END INIT INFO
+. /etc/default/rcS
+export PSPLASH_FIFO_DIR
+
if [ ! -e /dev/fb0 ]; then
echo "Framebuffer /dev/fb0 not detected"
echo "Boot splashscreen disabled"
@@ -23,7 +26,6 @@ for x in $CMDLINE; do
esac
done
-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
diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc
index d0d3149821..c9f6558115 100755
--- a/meta/recipes-core/sysvinit/sysvinit/rc
+++ b/meta/recipes-core/sysvinit/sysvinit/rc
@@ -17,6 +17,7 @@
. /etc/default/rcS
export VERBOSE
+export PSPLASH_FIFO_DIR
startup_progress() {
step=$(($step + $step_change))
@@ -27,7 +28,7 @@ startup_progress() {
fi
#echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
if type psplash-write >/dev/null 2>&1; then
- PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
+ psplash-write "PROGRESS $progress" || true
fi
}
@@ -173,7 +174,7 @@ startup() {
#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch
if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then
if type psplash-write >/dev/null 2>&1; then
- PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true
+ psplash-write "QUIT" || true
umount -l /mnt/.psplash
fi
fi
diff --git a/meta/recipes-core/sysvinit/sysvinit/rcS-default b/meta/recipes-core/sysvinit/sysvinit/rcS-default
index e608a77c75..c576ff0678 100644
--- a/meta/recipes-core/sysvinit/sysvinit/rcS-default
+++ b/meta/recipes-core/sysvinit/sysvinit/rcS-default
@@ -30,3 +30,5 @@ ROOTFS_READ_ONLY=no
# rcS is also used when using busybox init and shares initscripts, some initscripts
# need to have specific behavior depending on init system
INIT_SYSTEM=sysvinit
+# set the psplash fifo directory
+PSPLASH_FIFO_DIR=/mnt/.psplash