Commit: d6b109f364b89f9458971fcb0ed64b3b932de30b - device-generic-common (git)

device/generic/common

Commit MetaInfo

• Revision: d6b109f364b89f9458971fcb0ed64b3b932de30b (tree)
• Time: 2020-07-16 02:11:56
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

nativebridge: mount sfs with the ro option

If the sfs is in a read-only /system, mount may fail without the ro
option.

Reported-by: Katharine Chui <[e-mail]>

Change Summary

• modified: nativebridge/bin/enable_nativebridge

Incremental Difference

--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -22,7 +22,7 @@ fi
 if [ -s /system/lib$1/libhoudini.so ]; then
 	log -pi -thoudini "found /system/lib$1/libhoudini.so"
 elif [ -e /system/etc/houdini$v.sfs ]; then
-	mount /system/etc/houdini$v.sfs $dest_dir
+	mount -o ro /system/etc/houdini$v.sfs $dest_dir
 else
 	if mountpoint -q $dest_dir; then
 		kill -9 `fuser -m $dest_dir`
@@ -30,7 +30,7 @@ else
 	fi
 	mkdir -p /data/arm
 	cd /data/arm
-	while ! mount houdini$v.sfs $dest_dir; do
+	while ! mount -o ro houdini$v.sfs $dest_dir; do
 		while [ "$(getprop net.dns1)" = "" ]; do
 			sleep 10
 		done