From 882d664bfbee08c4cb30a89daf5bff6f75f2f857 Mon Sep 17 00:00:00 2001 From: Adam Boardman Date: Mon, 24 Apr 2023 14:21:16 +0100 Subject: [PATCH] Fixed paths --- usr/lib/lxc-android/lxc-android-notify | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/lib/lxc-android/lxc-android-notify b/usr/lib/lxc-android/lxc-android-notify index 12b9508..0713909 100755 --- a/usr/lib/lxc-android/lxc-android-notify +++ b/usr/lib/lxc-android/lxc-android-notify @@ -23,7 +23,7 @@ get_source_apex_name() { NAME="$(echo ${1} | sed -E 's|\.v[0-9]+$||g')" for choice in ${NAME} ${NAME}.release ${NAME}.debug ${NAME}.current; do - if [ -e "/android/system/apex/${choice}" ]; then + if [ -e "/system/apex/${choice}" ]; then echo "${choice}" break fi @@ -46,7 +46,7 @@ if [ $ANDROID_SDK_VERSION -ge 29 ]; then info "Detected Android 10+ container" # Wait for apex to show up - HYBRIS_LD_LIBRARY_PATH="/android/system/apex/com.android.runtime/${LIBDIR}/bionic:/android/system/apex/com.android.runtime.release/${LIBDIR}/bionic:/android/system/apex/com.android.runtime.debug/${LIBDIR}/bionic:/android/system/${LIBDIR}" \ + HYBRIS_LD_LIBRARY_PATH="/system/apex/com.android.runtime/${LIBDIR}/bionic:/system/apex/com.android.runtime.release/${LIBDIR}/bionic:/system/apex/com.android.runtime.debug/${LIBDIR}/bionic:/system/${LIBDIR}" \ WAITFORSERVICE_VALUE="ready" \ /usr/bin/waitforservice apexd.status @@ -64,11 +64,11 @@ if [ $ANDROID_SDK_VERSION -ge 29 ]; then source_apex=$(get_source_apex_name ${apex}) if [ -z "${source_apex}" ]; then - warning "Unable to finx source apex for apex ${apex}" + warning "Unable to find source apex for apex ${apex}" continue fi - source="/android/system/apex/${source_apex}" + source="/system/apex/${source_apex}" if [ -d "${source}" ]; then info "Replicating bind-mount for apex ${apex}"