mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

PSPLASH_FIFO_DIR: refactor

Browse Source 
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>
This commit is contained in:
Trevor Woerner
2020-12-24 10:31:03 -05:00
committed by Richard Purdie
parent 5aa004f101
commit a12ba3994d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/psplash/files/psplash-init
+3 -1
View File
@@ -7,6 +7,9 @@
# Default-Stop: # Default-Stop:
### END INIT INFO ### END INIT INFO
. /etc/default/rcS
export PSPLASH_FIFO_DIR
if [ ! -e /dev/fb0 ]; then if [ ! -e /dev/fb0 ]; then
echo "Framebuffer /dev/fb0 not detected" echo "Framebuffer /dev/fb0 not detected"
echo "Boot splashscreen disabled" echo "Boot splashscreen disabled"
@@ -23,7 +26,6 @@ for x in $CMDLINE; do
esac esac
done done
export PSPLASH_FIFO_DIR=/mnt/.psplash
[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR [ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR
if ! mountpoint -q $PSPLASH_FIFO_DIR; then if ! mountpoint -q $PSPLASH_FIFO_DIR; then
mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k
meta/recipes-core/sysvinit/sysvinit/rc
+3 -2
View File
@@ -17,6 +17,7 @@
. /etc/default/rcS . /etc/default/rcS
export VERBOSE export VERBOSE
export PSPLASH_FIFO_DIR
startup_progress() { startup_progress() {
step=$(($step + $step_change)) step=$(($step + $step_change))
@@ -27,7 +28,7 @@ startup_progress() {
fi fi
#echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size"
if type psplash-write >/dev/null 2>&1; then 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 fi
} }
@@ -173,7 +174,7 @@ startup() {
#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch #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 [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then
if type psplash-write >/dev/null 2>&1; 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 umount -l /mnt/.psplash
fi fi
fi fi
meta/recipes-core/sysvinit/sysvinit/rcS-default
+2
View File
@@ -30,3 +30,5 @@ ROOTFS_READ_ONLY=no
# rcS is also used when using busybox init and shares initscripts, some initscripts # rcS is also used when using busybox init and shares initscripts, some initscripts
# need to have specific behavior depending on init system # need to have specific behavior depending on init system
INIT_SYSTEM=sysvinit INIT_SYSTEM=sysvinit
# set the psplash fifo directory
PSPLASH_FIFO_DIR=/mnt/.psplash