Skip to contentSkip to conversation

psplash: create psplash tmpfs mount directory in psplash-init

PATCH Superseded Stefan Agner 2 participants 2 messages Jul 19, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 psplash: create psplash tmpfs mount directory in psplash-init

From: Stefan Agner <[email protected]>

The psplash binary uses TMPDIR as directory to store the FIFO to communicate with the psplash tools. This directory can be in any location an init system determines to be suitable, psplash-init uses /mnt/ for it. Rather than creating the mount directory in the recipe, just create it in the init script itself. This allows other init scripts to use a different location without having an unnecessary .psplash directory in /mnt.

---
 meta/recipes-core/psplash/files/psplash-init | 1 +
 meta/recipes-core/psplash/psplash_git.bb     | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
meta/recipes-core/psplash/files/psplash-init +1 -0
index 0bce1de536..7a3902a7e0 100755
@@ -24,6 +24,7 @@ for x in $CMDLINE; do
 done
 
 export TMPDIR=/mnt/.psplash
+mkdir -p $TMPDIR
 mount tmpfs -t tmpfs $TMPDIR -o,size=40k
 
 rotation=0
meta/recipes-core/psplash/psplash_git.bb +0 -3
index 3161a5e3f1..56734c1582 100644
@@ -97,7 +97,6 @@ python do_compile () {
 }
 
 do_install_append() {
-	install -d ${D}/mnt/.psplash/
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh
 	install -d ${D}${bindir}
@@ -107,8 +106,6 @@ do_install_append() {
 	rm -f ${D}${bindir}/psplash
 }
 
-FILES_${PN} += "/mnt/.psplash"
-
 INITSCRIPT_NAME = "psplash.sh"
 INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
 
Signature · 1 line
2.13.6
#1 lore raw
Quoted 22 lines · Stefan Agner

From: Stefan Agner <[email protected]>

The psplash binary uses TMPDIR as directory to store the FIFO to communicate with the psplash tools. This directory can be in any location an init system determines to be suitable, psplash-init uses /mnt/ for it. Rather than creating the mount directory in the recipe, just create it in the init script itself. This allows other init scripts to use a different location without having an unnecessary .psplash directory in /mnt.

---
 meta/recipes-core/psplash/files/psplash-init | 1 +
 meta/recipes-core/psplash/psplash_git.bb     | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
meta/recipes-core/psplash/files/psplash-init +0 -0
index 0bce1de536..7a3902a7e0 100755

meta/recipes-core/psplash/files/psplash-init for x in $CMDLINE; do · line 30

Quoted 7 lines
meta/recipes-core/psplash/files/psplash-init +1 -0
@@ -24,6 +24,7 @@ for x in $CMDLINE; do
 done
 
 export TMPDIR=/mnt/.psplash
+mkdir -p $TMPDIR
 mount tmpfs -t tmpfs $TMPDIR -o,size=40k
 
 rotation=0

The main reason for avoiding this is probably the extra fork overhead of mkdir. It sounds trivial but the fork/exec calls add up over a boot process.

Testing whether that directory exists before the mkdir might help with that.

Cheers,

Richard