sysvinit rc: Use PSPLASH_FIFO_DIR for progress fifo
PATCH 1/1 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.
--- meta/recipes-core/sysvinit/sysvinit/rc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
meta/recipes-core/sysvinit/sysvinit/rc +3 -6
@@ -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
Signature · 1 line
2.28.0
Please backport this to dunfell.
Thanks,
Mihai
Quoted 47 lines · Michael Gloff
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(-)meta/recipes-core/sysvinit/sysvinit/rc +0
-0@@ -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"
meta/recipes-core/sysvinit/sysvinit/rc +2
-5- #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
}meta/recipes-core/sysvinit/sysvinit/rc +0
-0@@ -176,7 +173,7 @@ startup() { #Uncomment to cause psplash to exit manually, otherwise it exits when it seesa VC switch
if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ];
then
if type psplash-write >/dev/null 2>&1; thenmeta/recipes-core/sysvinit/sysvinit/rc +1
-1- TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true umount -l /mnt/.psplash fi fiSignature · 1 line
2.28.0
Add Steve, who maintains dunfell.
Quoted 1 line · On 2020-09-26 7:27 a.m., [email protected] wrote:
Please backport this to dunfell.
Hi Mihai,
Steve might do that but it would be better if you could cherry-pick it back, test it, and send a patch:
http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded
Thanks,
../Randy
Quoted 57 lines
Thanks,
MihaiQuoted 51 lines · Michael Gloff
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(-)meta/recipes-core/sysvinit/sysvinit/rc +0
-0@@ -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"
meta/recipes-core/sysvinit/sysvinit/rc +2
-5- #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
}meta/recipes-core/sysvinit/sysvinit/rc +0
-0@@ -176,7 +173,7 @@ startup() { #Uncomment to cause psplash to exit manually, otherwise it exits when it seesa VC switch
if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ];
then
if type psplash-write >/dev/null 2>&1; thenmeta/recipes-core/sysvinit/sysvinit/rc +1
-1- TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true umount -l /mnt/.psplash fi fiSignature · 1 line
2.28.0
Signature · 2 lines
# Randy MacLeod # Wind River Linux
I was meaning to send the backport request as well. This is a long standing bug and rc hasn't changed in quite some time, so the patch should apply cleanly to dunfell.
Should I send the patch for dunfell, or can c19c69ae8ddcb37ad5683b6962ec3def37ad4512 be cherry-picked?
Michael
Quoted 85 lines · Randy MacLeod
Add Steve, who maintains dunfell.
Quoted 1 line · On 2020-09-26 7:27 a.m., [email protected] wrote:
Please backport this to dunfell.
Hi Mihai,
Steve might do that but it would be better if you could cherry-pick it back, test it, and send a patch:
http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbeddedThanks,
../Randy
Quoted 17 lines
Thanks,
MihaiQuoted 11 lines · Michael Gloff
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(-)Quoted 12 lines
meta/recipes-core/sysvinit/sysvinit/rc
Quoted 12 lines
meta/recipes-core/sysvinit/sysvinit/rc +0
-0@@ -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"
meta/recipes-core/sysvinit/sysvinit/rc +0
-2- #if type psplash-write >/dev/null 2>&1; then - # TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" ||true
Quoted 5 lines
meta/recipes-core/sysvinit/sysvinit/rc startup_progress() {
Quoted 5 lines
meta/recipes-core/sysvinit/sysvinit/rc +2
-3- #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" ||
Quoted 6 lines
meta/recipes-core/sysvinit/sysvinit/rc startup() { · line 173
Quoted 6 lines
true
fi
}meta/recipes-core/sysvinit/sysvinit/rc +0
-0@@ -176,7 +173,7 @@ startup() { #Uncomment to cause psplash to exit manually, otherwise it exits whenit sees
Quoted 2 lines
Quoted 2 lines
a VC switch
if [ "x$runlevel" != "xS" ] && [ ! -x/etc/rc${runlevel}.d/S??xserver-nodm ];
Quoted 7 lines
Quoted 7 lines
then
if type psplash-write >/dev/null 2>&1; thenmeta/recipes-core/sysvinit/sysvinit/rc +1
-1- TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true umount -l /mnt/.psplash fi fiQuoted 8 lines
Quoted 8 lines
--
2.28.0--
# Randy MacLeod
# Wind River Linux
Quoted 3 lines · Michael Gloff
I was meaning to send the backport request as well. This is a long standing bug and rc hasn't changed in quite some time, so the patch should apply cleanly to dunfell. Should I send the patch for dunfell, or can
c19c69ae8ddcb37ad5683b6962ec3def37ad4512be cherry-picked?
No need to send a patch, I'll cherry-pick from master.
Thanks!
Steve
Quoted 83 lines · Randy MacLeod
Quoted 81 lines
Add Steve, who maintains dunfell.
Quoted 1 line · On 2020-09-26 7:27 a.m., [email protected] wrote:
Please backport this to dunfell.
Hi Mihai,
Steve might do that but it would be better if you could cherry-pick it back, test it, and send a patch:
http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbeddedThanks,
../Randy
Quoted 49 lines
Thanks,
MihaiQuoted 43 lines · Michael Gloff
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(-)meta/recipes-core/sysvinit/sysvinit/rc +0
-0@@ -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"
meta/recipes-core/sysvinit/sysvinit/rc +2
-5- #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
}meta/recipes-core/sysvinit/sysvinit/rc +0
-0@@ -176,7 +173,7 @@ startup() { #Uncomment to cause psplash to exit manually, otherwise it exits when it seesa VC switch
if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ];
then
if type psplash-write >/dev/null 2>&1; thenmeta/recipes-core/sysvinit/sysvinit/rc +1
-1- TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true umount -l /mnt/.psplash fi fiQuoted 8 lines
Quoted 8 lines
--
2.28.0--
# Randy MacLeod
# Wind River Linux