From 2162e6b6d5841fddd576bdffde0f18ad09f77cee Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Tue, 4 Sep 2018 20:07:06 +0200 Subject: [PATCH] error out if /data can't be mounted --- CommonInstaller | 2 +- patcher/CommonPatcher | 2 +- uninstaller/META-INF/com/google/android/update-binary | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CommonInstaller b/CommonInstaller index 130546c..0f0d191 100644 --- a/CommonInstaller +++ b/CommonInstaller @@ -208,7 +208,7 @@ mount_partitions () { [ "${SLOT}" = "_" ] && SLOT= fi - is_mounted /data || mount /data + is_mounted /data || mount /data || error "failed to mount /data!" ${BOOTMODE} || mount -o bind /dev/urandom /dev/random diff --git a/patcher/CommonPatcher b/patcher/CommonPatcher index 0f66065..4919e47 100644 --- a/patcher/CommonPatcher +++ b/patcher/CommonPatcher @@ -83,7 +83,7 @@ mount_partitions () { [ "${SLOT}" = "_" ] && SLOT= fi - is_mounted /data || mount /data + is_mounted /data || mount /data || error "failed to mount /data!" ${BOOTMODE} || mount -o bind /dev/urandom /dev/random diff --git a/uninstaller/META-INF/com/google/android/update-binary b/uninstaller/META-INF/com/google/android/update-binary index a50b7b2..3fb80f9 100644 --- a/uninstaller/META-INF/com/google/android/update-binary +++ b/uninstaller/META-INF/com/google/android/update-binary @@ -167,7 +167,7 @@ mount_partitions () { [ "${SLOT}" = "_" ] && SLOT= fi - is_mounted /data || mount /data + is_mounted /data || mount /data || error "failed to mount /data!" ! is_mounted /system && mount -o rw /system