diff options
| author |   Kevin Hao <kexin.hao@windriver.com> | 2019-08-19 17:27:15 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-21 13:21:46 +0100 |
| commit | 5cea0448c5c75b9defc5fc2582e9b0c14e26a4e9 (patch) | |
| tree | 5376d9a432cb077757ee14bbbb7346a9a344b7a6 | |
| parent | e05f5e1d44293827260541e301ce25d15eb405af (diff) | |
| download | openembedded-core-contrib-5cea0448c5c75b9defc5fc2582e9b0c14e26a4e9.tar.gz | |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | meta/recipes-core/psplash/files/psplash-init | 4 |
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 |