From a12ba3994d0fa1e4237e40e9e3f06f0708a2ba07 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Thu, 24 Dec 2020 10:31:03 -0500 Subject: 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. (From OE-Core rev: dc4065b6f101e6418301e0cb8d73ae3a1b2bdfb2) Signed-off-by: Trevor Woerner Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit/rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/sysvinit/sysvinit/rc') 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 -- cgit v1.2.3-54-g00ecf