no longer require mounting /data in all places

4 years ago · 6bc61c9925
parent 7411c61b9e
commit 6bc61c9925
3 changed files with 3 additions and 5 deletions
--- a/patcher/CommonPatcher
+++ b/patcher/CommonPatcher
@ -130,7 +130,7 @@ mount_partitions () {
 			fi
 		fi

-		is_mounted /data || mount /data || error "failed to mount /data!"
+		is_mounted /data || mount /data || echo "failed to mount /data!"

 		mount -o bind /dev/urandom /dev/random

@ -481,8 +481,6 @@ setup_patcher () {
 		chmod 0755 "${BASEDIR}/${bin}" || \
 			error "failed to prepare environment"
 	done
-
-	mkdir -p /data/adb/
 }

 call_dalvikvm  () {
--- a/systest/SysTest
+++ b/systest/SysTest
@ -129,7 +129,7 @@ mount_partitions () {

 		SYSTEM_AS_ROOT=$(grep_prop ro.build.system_root_image)
 	else
-		is_mounted /data || mount /data || error "failed to mount /data!"
+		is_mounted /data || mount /data || echo "failed to mount /data!"

 		mount -o bind /dev/urandom /dev/random

--- a/uninstaller/META-INF/com/google/android/update-binary
+++ b/uninstaller/META-INF/com/google/android/update-binary
@ -146,7 +146,7 @@ mount_partitions () {
 			fi
 		fi

-		is_mounted /data || mount /data || error "failed to mount /data!"
+		is_mounted /data || mount /data || echo "failed to mount /data!"

 		mount -o bind /dev/urandom /dev/random