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:06 +0000 |
commit | dc4065b6f101e6418301e0cb8d73ae3a1b2bdfb2 (patch) | |
tree | 33f57e11b038094a5583943942b006c51fa4643e /meta/recipes-core/sysvinit | |
parent | 99206612a58e6b69718910e0806d9d36997b2fba (diff) | |
download | openembedded-core-contrib-dc4065b6f101e6418301e0cb8d73ae3a1b2bdfb2.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.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit')
-rwxr-xr-x | meta/recipes-core/sysvinit/sysvinit/rc | 5 | ||||
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/rcS-default | 2 |
2 files changed, 5 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 @@ . /etc/default/rcS export VERBOSE +export PSPLASH_FIFO_DIR startup_progress() { step=$(($step + $step_change)) @@ -27,7 +28,7 @@ startup_progress() { 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 - PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true + psplash-write "PROGRESS $progress" || true fi } @@ -173,7 +174,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 - PSPLASH_FIFO_DIR=/mnt/.psplash psplash-write "QUIT" || true + psplash-write "QUIT" || true umount -l /mnt/.psplash fi fi diff --git a/meta/recipes-core/sysvinit/sysvinit/rcS-default b/meta/recipes-core/sysvinit/sysvinit/rcS-default index e608a77c75..c576ff0678 100644 --- a/meta/recipes-core/sysvinit/sysvinit/rcS-default +++ b/meta/recipes-core/sysvinit/sysvinit/rcS-default @@ -30,3 +30,5 @@ ROOTFS_READ_ONLY=no # rcS is also used when using busybox init and shares initscripts, some initscripts # need to have specific behavior depending on init system INIT_SYSTEM=sysvinit +# set the psplash fifo directory +PSPLASH_FIFO_DIR=/mnt/.psplash |