Patcher: vendor mount code

6 years ago · 9be0cc4eec
parent fb0fb8e4b4
commit 9be0cc4eec
2 changed files with 9 additions and 14 deletions
--- a/11
+++ b/11
@ -227,13 +227,10 @@ mount_partitions () {

 	[ ! -f /system/build.prop ] && error "failed to mount /system (unsupported A/B device?)"

-	if [ -L /system/vendor ]; then
-		is_mounted /vendor || mount -o ro /vendor 2>/dev/null
-		if ! is_mounted /vendor; then
-			VENDORBLOCK=$(find /dev/block -iname vendor${SLOT} | head -n 1)
-			mount -t ext4 -o ro ${VENDORBLOCK} /vendor
-		fi
-		is_mounted /vendor || error "failed to mount /vendor"
+	is_mounted /vendor || mount -o ro /vendor 2>/dev/null
+	if ! is_mounted /vendor; then
+		VENDORBLOCK=$(find /dev/block -iname vendor${SLOT} | head -n 1)
+		mount -t ext4 -o ro ${VENDORBLOCK} /vendor 2>/dev/null
 	fi
 }

--- a/patcher/CommonPatcher
+++ b/patcher/CommonPatcher
@ -87,14 +87,12 @@ mount_partitions () {

 	[ ! -f /system/build.prop ] && error "failed to mount /system (unsupported A/B device?)"

-	if [ -L /system/vendor ]; then
-		is_mounted /vendor || mount -o ro /vendor 2>/dev/null
-		if ! is_mounted /vendor; then
-			VENDORBLOCK=$(find /dev/block -iname vendor${SLOT} | head -n 1)
-			mount -t ext4 -o ro ${VENDORBLOCK} /vendor
-		fi
-		is_mounted /vendor || error "failed to mount /vendor"
+	is_mounted /vendor || mount -o ro /vendor 2>/dev/null
+	if ! is_mounted /vendor; then
+		VENDORBLOCK=$(find /dev/block -iname vendor${SLOT} | head -n 1)
+		mount -t ext4 -o ro ${VENDORBLOCK} /vendor 2>/dev/null
 	fi
+
 }

 error () {