halium: allow fallbacking to an eventual system image available inside the rootfs on "halium" file layouts#25
Open
g7 wants to merge 1 commit intoHalium:haliumfrom
Open
Conversation
…e the rootfs on "halium" file layouts Some distributions (e.g. hybris-mobian) ship the Android system image inside the rootfs image in userdata, thus breaking the the assumption that if rootfs.img exists, a matching system image in userdata is present. This commit reworks the image search inside `identify_android_image()` so that every supported path is tested on "halium" file layouts. ANDROID_IMAGE is determined there now too, and stores the real full path to the image. Note: if the system image is available both in userdata and inside the halium rootfs, the former is preferred. Signed-off-by: Eugenio Paolantonio (g7) <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Some distributions (e.g. hybris-mobian) ship the Android system image inside the
rootfs image in userdata, thus breaking the the assumption that if rootfs.img exists,
a matching system image in userdata is present.
This commit reworks the image search inside
identify_android_image()so that every supportedpath is tested on "halium" file layouts. ANDROID_IMAGE is determined there now too, and
stores the real full path to the image.
Note: if the system image is available both in userdata and inside the halium rootfs,
the former is preferred.
Signed-off-by: Eugenio Paolantonio (g7) [email protected]