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-10-06 14:15:21 +0100
commit027d451239e247215c21213f960e71980fb1cad2 (patch)
treea4f00eb78a19535d6bc03a79d6b9ff0d3e766946
parent7a6cd694bd2326485125fb2c39331599acd92661 (diff)
downloadpoky-027d451239e247215c21213f960e71980fb1cad2.tar.gz
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. (From OE-Core rev: 0f395ab9d276595e75233dbdbb9ebb610bd1d3af) Signed-off-by: Michael Gloff <mgloff@emacinc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2b48bbd0a8de17df74d1fae12b5e4eb3c2c0fb90) Signed-off-by: Steve Sakoman <steve@sakoman.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() {
26 progress=$progress_size 26 progress=$progress_size
27 fi 27 fi
28 #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" 28 #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
29 #if type psplash-write >/dev/null 2>&1; then 29 if type psplash-write >/dev/null 2>&1; then
30 # TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true 30 PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true
31 #fi
32 if [ -e /mnt/.psplash/psplash_fifo ]; then
33 echo "PROGRESS $progress" > /mnt/.psplash/psplash_fifo
34 fi 31 fi
35} 32}
36 33
@@ -176,7 +173,7 @@ startup() {
176#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch 173#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch
177if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then 174if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then
178 if type psplash-write >/dev/null 2>&1; then 175 if type psplash-write >/dev/null 2>&1; then
179 TMPDIR=/mnt/.psplash psplash-write "QUIT" || true 176 PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true
180 umount -l /mnt/.psplash 177 umount -l /mnt/.psplash
181 fi 178 fi
182fi 179fi