gemian-fixes/lxc-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed paths

Browse source
This commit is contained in:
Adam Boardman 2023-04-24 14:21:16 +01:00
parent aed61d35d8
commit 882d664bfb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr/lib/lxc-android/lxc-android-notify
View file

@ -23,7 +23,7 @@ get_source_apex_name() {
NAME="$(echo ${1} | sed -E 's|\.v[0-9]+$||g')" NAME="$(echo ${1} | sed -E 's|\.v[0-9]+$||g')"
for choice in ${NAME} ${NAME}.release ${NAME}.debug ${NAME}.current; do 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}" echo "${choice}"
break break
fi fi
@ -46,7 +46,7 @@ if [ $ANDROID_SDK_VERSION -ge 29 ]; then
info "Detected Android 10+ container" info "Detected Android 10+ container"
# Wait for apex to show up # 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" \ WAITFORSERVICE_VALUE="ready" \
/usr/bin/waitforservice apexd.status /usr/bin/waitforservice apexd.status
@ -64,11 +64,11 @@ if [ $ANDROID_SDK_VERSION -ge 29 ]; then
source_apex=$(get_source_apex_name ${apex}) source_apex=$(get_source_apex_name ${apex})
if [ -z "${source_apex}" ]; then if [ -z "${source_apex}" ]; then
warning "Unable to finx source apex for apex ${apex}" warning "Unable to find source apex for apex ${apex}"
continue continue
fi fi
source="/android/system/apex/${source_apex}" source="/system/apex/${source_apex}"
if [ -d "${source}" ]; then if [ -d "${source}" ]; then
info "Replicating bind-mount for apex ${apex}" info "Replicating bind-mount for apex ${apex}"