summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-rwxr-xr-xmeta/recipes-core/psplash/files/psplash-init4
-rwxr-xr-xmeta/recipes-core/sysvinit/sysvinit/rc5
-rw-r--r--meta/recipes-core/sysvinit/sysvinit/rcS-default2
3 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init
index f58e043733..e0f80bcdc0 100755
--- a/meta/recipes-core/psplash/files/psplash-init
+++ b/meta/recipes-core/psplash/files/psplash-init
@@ -7,6 +7,9 @@
7# Default-Stop: 7# Default-Stop:
8### END INIT INFO 8### END INIT INFO
9 9
10. /etc/default/rcS
11export PSPLASH_FIFO_DIR
12
10if [ ! -e /dev/fb0 ]; then 13if [ ! -e /dev/fb0 ]; then
11 echo "Framebuffer /dev/fb0 not detected" 14 echo "Framebuffer /dev/fb0 not detected"
12 echo "Boot splashscreen disabled" 15 echo "Boot splashscreen disabled"
@@ -23,7 +26,6 @@ for x in $CMDLINE; do
23 esac 26 esac
24done 27done
25 28
26export PSPLASH_FIFO_DIR=/mnt/.psplash
27[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR 29[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR
28if ! mountpoint -q $PSPLASH_FIFO_DIR; then 30if ! mountpoint -q $PSPLASH_FIFO_DIR; then
29 mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k 31 mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k
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
19export VERBOSE 19export VERBOSE
20export PSPLASH_FIFO_DIR
20 21
21startup_progress() { 22startup_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
174if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then 175if [ "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
179fi 180fi
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
30# rcS is also used when using busybox init and shares initscripts, some initscripts 30# rcS is also used when using busybox init and shares initscripts, some initscripts
31# need to have specific behavior depending on init system 31# need to have specific behavior depending on init system
32INIT_SYSTEM=sysvinit 32INIT_SYSTEM=sysvinit
33# set the psplash fifo directory
34PSPLASH_FIFO_DIR=/mnt/.psplash