Please backport this to dunfell. Thanks, Mihai
On Sat, Aug 29, 2020 at 06:09 AM, Michael Gloff wrote: > > 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 <[email protected]> > --- > meta/recipes-core/sysvinit/sysvinit/rc | 9 +++------ > 1 file 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 > -- > 2.28.0 > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#142811): https://lists.openembedded.org/g/openembedded-core/message/142811 Mute This Topic: https://lists.openembedded.org/mt/76488288/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
