summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gloff <mgloff@emacinc.com>2020-08-28 22:09:01 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 15:58:05 +0100
commit2b48bbd0a8de17df74d1fae12b5e4eb3c2c0fb90 (patch)
tree8b5d54275edaca67a2f7d9858d79e25699f62e76
parentea8fbcb7978ce48d7a9a83143d09402329535f86 (diff)
downloadopenembedded-core-contrib-2b48bbd0a8de17df74d1fae12b5e4eb3c2c0fb90.tar.gz
openembedded-core-contrib-2b48bbd0a8de17df74d1fae12b5e4eb3c2c0fb90.tar.bz2
openembedded-core-contrib-2b48bbd0a8de17df74d1fae12b5e4eb3c2c0fb90.zip
sysvinit rc: Use PSPLASH_FIFO_DIR for progress fifo
psplash expects the fifo to be in /run or specified by PSPLASH_FIFO_DIR. This patch allows psplash to quit normally. Also, fix the work around of using echo directly into the fifo and use psplash-write. Signed-off-by: Michael Gloff <mgloff@emacinc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-core/sysvinit/sysvinit/rc9
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/rc b/meta/recipes-core/sysvinit/sysvinit/rc
index 7ca41ae1ae..fd1fdd26ba 100755
--- a/meta/recipes-core/sysvinit/sysvinit/rc
+++ b/meta/recipes-core/sysvinit/sysvinit/rc
@@ -26,11 +26,8 @@ startup_progress() {
progress=$progress_size
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
- # TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
- #fi
- if [ -e /mnt/.psplash/psplash_fifo ]; then
- echo "PROGRESS $progress" > /mnt/.psplash/psplash_fifo
+ if type psplash-write >/dev/null 2>&1; then
+ PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
fi
}
@@ -176,7 +173,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
- TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
+ PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true
umount -l /mnt/.psplash
fi
fi