From f45a48887fd5c0e632fb1bb3be8b19fc2402f395 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Mon, 19 Aug 2019 17:27:15 +0800 Subject: 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 (From OE-Core rev: 5cea0448c5c75b9defc5fc2582e9b0c14e26a4e9) Signed-off-by: Kevin Hao Signed-off-by: Richard Purdie --- 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 fee23e681c..dcb751907f 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 -- cgit 1.2.3-korg