read-only-rootfs-hook.sh: check before bind mounting /var/lib
It's possible that /var/lib is on a separate writable partition. In such situation, we should not bind mount /var/lib with tmpfs, becasue it's already writable. This patch fixes this problem by checking whether /var/lib is already on a writable partition. [YOCTO #4888] (From OE-Core rev: 86ac10995fd08226f82d87e23fda5d4898c3190f) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e6e44cf9c1
commit
1dff47b097
|
@ -4,10 +4,35 @@
|
|||
|
||||
[ "$ROOTFS_READ_ONLY" = "no" ] && exit 0
|
||||
|
||||
is_on_read_only_partition () {
|
||||
DIRECTORY=$1
|
||||
dir=`readlink -f $DIRECTORY`
|
||||
while true; do
|
||||
if [ ! -d "$dir" ]; then
|
||||
echo "ERROR: $dir is not a directory"
|
||||
exit 1
|
||||
else
|
||||
for flag in `awk -v dir=$dir '{ if ($2 == dir) { print "FOUND"; split($4,FLAGS,",") } }; \
|
||||
END { for (f in FLAGS) print FLAGS[f] }' < /proc/mounts`; do
|
||||
[ "$flag" = "FOUND" ] && partition="read-write"
|
||||
[ "$flag" = "ro" ] && { partition="read-only"; break; }
|
||||
done
|
||||
if [ "$dir" = "/" -o -n "$partition" ]; then
|
||||
break
|
||||
else
|
||||
dir=`dirname $dir`
|
||||
fi
|
||||
fi
|
||||
done
|
||||
[ "$partition" = "read-only" ] && echo "yes" || echo "no"
|
||||
}
|
||||
|
||||
if [ "$1" = "start" ] ; then
|
||||
grep -q "tmpfs /var/volatile" /proc/mounts || mount /var/volatile
|
||||
mkdir -p /var/volatile/lib
|
||||
cp -a /var/lib/* /var/volatile/lib
|
||||
mount --bind /var/volatile/lib /var/lib
|
||||
if [ `is_on_read_only_partition /var/lib` = "yes" ]; then
|
||||
grep -q "tmpfs /var/volatile" /proc/mounts || mount /var/volatile
|
||||
mkdir -p /var/volatile/lib
|
||||
cp -a /var/lib/* /var/volatile/lib
|
||||
mount --bind /var/volatile/lib /var/lib
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in New Issue