diff options
author | Trevor Woerner <twoerner@gmail.com> | 2020-12-24 10:31:03 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-05 13:48:41 +0000 |
commit | a12ba3994d0fa1e4237e40e9e3f06f0708a2ba07 (patch) | |
tree | 4262ddef974f46e4252da44603d44f6785d339bd /meta/recipes-core/sysvinit/sysvinit/rc | |
parent | 5aa004f101da301c9ce679acaad958f9bb2d90ee (diff) | |
download | poky-a12ba3994d0fa1e4237e40e9e3f06f0708a2ba07.tar.gz |
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 <twoerner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit/sysvinit/rc')
-rwxr-xr-x | meta/recipes-core/sysvinit/sysvinit/rc | 5 |
1 files changed, 3 insertions, 2 deletions
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 @@ | |||
17 | 17 | ||
18 | . /etc/default/rcS | 18 | . /etc/default/rcS |
19 | export VERBOSE | 19 | export VERBOSE |
20 | export PSPLASH_FIFO_DIR | ||
20 | 21 | ||
21 | startup_progress() { | 22 | startup_progress() { |
22 | step=$(($step + $step_change)) | 23 | step=$(($step + $step_change)) |
@@ -27,7 +28,7 @@ startup_progress() { | |||
27 | fi | 28 | fi |
28 | #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" | 29 | #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 | 30 | if type psplash-write >/dev/null 2>&1; then |
30 | PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true | 31 | psplash-write "PROGRESS $progress" || true |
31 | fi | 32 | fi |
32 | } | 33 | } |
33 | 34 | ||
@@ -173,7 +174,7 @@ startup() { | |||
173 | #Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch | 174 | #Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch |
174 | if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then | 175 | if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then |
175 | if type psplash-write >/dev/null 2>&1; then | 176 | if type psplash-write >/dev/null 2>&1; then |
176 | PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true | 177 | psplash-write "QUIT" || true |
177 | umount -l /mnt/.psplash | 178 | umount -l /mnt/.psplash |
178 | fi | 179 | fi |
179 | fi | 180 | fi |