summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2019-08-19 17:27:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-21 15:29:02 +0100
commitf45a48887fd5c0e632fb1bb3be8b19fc2402f395 (patch)
tree82f80f9acde4252a4d7e1fed9da0b37607ce1568
parentadac6e9cda6a7306aac8eeee02f57c8158e2fc4c (diff)
downloadopenembedded-core-contrib-f45a48887fd5c0e632fb1bb3be8b19fc2402f395.tar.gz
openembedded-core-contrib-f45a48887fd5c0e632fb1bb3be8b19fc2402f395.tar.bz2
openembedded-core-contrib-f45a48887fd5c0e632fb1bb3be8b19fc2402f395.zip
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 <kexin.hao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-core/psplash/files/psplash-init4
1 files changed, 3 insertions, 1 deletions
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