[oe-commits] [openembedded-core] 03/07: psplash: Avoid mount the psplash tmpfs twice

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit eab2fa183d1cb5bbb484d9e5dc2271efaae35def
Author: Kevin Hao <kexin.hao at windriver.com>
AuthorDate: Mon Aug 19 17:27:15 2019 +0800

    psplash: Avoid mount the psplash tmpfs twice
    
    The /etc/init.d/psplash.sh will be invoked both in boot and
    shutdown/reboot. And the psplash tmpfs will be mounted twice. This
    will trigger a bug in umount and let the system hang when
    shutdown/reboot. I already made a patch [1] to fix the issue in
    umount, but there is no reason for the psplash to do the twice mount.
    So also fix it.
    
    [Yocto 13461]
    
    [1] https://lore.kernel.org/util-linux/20190819083022.12289-1-kexin.hao@windriver.com/T/#u
    
    Signed-off-by: Kevin Hao <kexin.hao at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/psplash/files/psplash-init | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init
index fee23e6..dcb7519 100755
--- a/meta/recipes-core/psplash/files/psplash-init
+++ b/meta/recipes-core/psplash/files/psplash-init
@@ -25,7 +25,9 @@ done
 
 export TMPDIR=/mnt/.psplash
 [ -d $TMPDIR ] || mkdir -p $TMPDIR
-mount tmpfs -t tmpfs $TMPDIR -o,size=40k
+if [ ! mountpoint -q $TMPDIR ]; then
+	mount tmpfs -t tmpfs $TMPDIR -o,size=40k
+fi
 
 rotation=0
 if [ -e /etc/rotation ]; then

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.