Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68ABFC7EE31 for ; Fri, 27 Jun 2025 13:09:47 +0000 (UTC) Subject: psplash: Do not mount PSPLASH_FIFO_DIR if the env variable is empty To: openembedded-core@lists.openembedded.org From: "falk bauer" X-Originating-Location: =?UTF-8?B?RMO8c3NlbGRvcmYsIE5vcnRoIFJoaW5lLVdlc3RwaGFsaWEsIERF?= (80.152.229.14) X-Originating-Platform: Linux Firefox 139 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Fri, 27 Jun 2025 06:09:43 -0700 Message-ID: Content-Type: multipart/alternative; boundary="9UM5TH661jAJFxTK2z85" List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 27 Jun 2025 13:09:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219408 --9UM5TH661jAJFxTK2z85 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The script file psplash.sh tries to mount the PSPLASH_FIFO_DIR variable. If the variable is empty, the mountpoint command returns a usage text (busybox mountpoint here, util-linux mountpoint behaves the same): BusyBox v1.37.0 () multi-call binary. Usage: mountpoint [-q] { [-dn] DIR | -x DEVICE } :~# BusyBox v1.37.0 () multi-call binary The return code with this console output is 0 and the mount command in the if statement is executed. Then this mount also fails with an empty mountpoint argument. The source code of psplash respects an empty PSPLASH_FIFO_DIR variable (see psplash.c) and makes a fallback to "/run". So the psplash.sh script sh= ould also respect the empty var. Try to mount the PSPLASH_FIFO_DIR only if the variable is not empty. Signed-off-by: Falk Bauer --- meta/recipes-core/psplash/files/psplash-init | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-co= re/psplash/files/psplash-init index e0f80bcdc03..69496a48bf6 100644 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -26,9 +26,11 @@ for x in $CMDLINE; do esac done -[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR -if ! mountpoint -q $PSPLASH_FIFO_DIR; then - =C2=A0 =C2=A0mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=3D40k +if [ -n "${PSPLASH_FIFO_DIR}" ]; then + =C2=A0 =C2=A0 =C2=A0 =C2=A0[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_= FIFO_DIR + =C2=A0 =C2=A0 =C2=A0 =C2=A0if ! mountpoint -q $PSPLASH_FIFO_DIR ; then + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mount tmpfs -t tmp= fs $PSPLASH_FIFO_DIR -o,size=3D40k + =C2=A0 =C2=A0 =C2=A0 =C2=A0fi fi rotation=3D0 --9UM5TH661jAJFxTK2z85 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable
The script file psplash.sh tries to mount the PSPLASH_FIFO_DIR variabl= e.
If the variable is empty, the mountpoint command returns a usage te= xt
(busybox mountpoint here, util-linux mountpoint behaves the same):<= br /> 
BusyBox v1.37.0 () multi-call binary.
Usage: mountpoi= nt [-q] { [-dn] DIR | -x DEVICE } :~# BusyBox v1.37.0
() multi-call bi= nary
 
The return code with this console output is 0 and the= mount command in the
if statement is executed.
Then this mount a= lso fails with an empty mountpoint argument.
The source code of psplas= h respects an empty PSPLASH_FIFO_DIR variable
(see psplash.c) and make= s a fallback to "/run". So the psplash.sh script should
also respect t= he empty var.
 
Try to mount the PSPLASH_FIFO_DIR only if th= e variable is not empty.
 
Signed-off-by: Falk Bauer <f.b= auer@igi-systems.com>
---
 meta/recipes-core/psplash/file= s/psplash-init | 8 +++++---
 1 file changed, 5 insertions(+), 3 d= eletions(-)
diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recip= es-core/psplash/files/psplash-init
index e0f80bcdc03..69496a48bf6 1006= 44
--- a/meta/recipes-core/psplash/files/psplash-init
+++ b/meta/= recipes-core/psplash/files/psplash-init
@@ -26,9 +26,11 @@ for x in $C= MDLINE; do
         esac
 done
 
-[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR
-= if ! mountpoint -q $PSPLASH_FIFO_DIR; then
-    mount tmpfs = -t tmpfs $PSPLASH_FIFO_DIR -o,size=3D40k
+if [ -n "${PSPLASH_FIFO_DIR}= " ]; then
+        [ -d $PSPLASH_FIFO_DIR ] || mkd= ir -p $PSPLASH_FIFO_DIR
+        if ! mountpoint -= q $PSPLASH_FIFO_DIR ; then
+            =    mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=3D40k
+ &= nbsp;      fi
 fi
 
 rotation= =3D0
--9UM5TH661jAJFxTK2z85--