ubports: Filter wrongly matching partitions from upgrader #30
Conversation
This file contains 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
/system_ext seldomly is the partition we want to flash with a system-image, so filter it out and let the right dm-N device take it's sole place for system-image-upgrader to do its job. Change-Id: Ieca4e433d23574b82dc62c5368eed9dd93bfd1f5
Flohack74
reviewed
Jul 4, 2022
| @@ -279,7 +279,7 @@ USE_SYSTEM_PARTITION=1 | |||
| # However, do not use the block device name in the kernel command line, as that is not consistently | |||
| # named in booting normal and recovery modes. Expect fstab to have a system mountpoint or use a fallback. | |||
| if [ "$USE_SYSTEM_PARTITION" -eq 1 ];then | |||
| SYSTEM_PARTITION=$(grep "^[^#]" /etc/fstab | grep -e "\(/mnt\)*/system\(_root\)*" | cut -f 1 -d\ ) | |||
| SYSTEM_PARTITION=$(grep "^[^#]" /etc/fstab | grep -v "/system_ext" | grep -e "\(/mnt\)*/system\(_root\)*" | cut -f 1 -d\ ) | |||
There was a problem hiding this comment.
Can you merge this with the check for system_root behind?
There was a problem hiding this comment.
Tried and failed, which is why I did the filtering in between.
There was a problem hiding this comment.
Should we merge this some day :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
/system_ext seldomly is the partition we want to flash with
a system-image, so filter it out and let the right dm-N device
take it's sole place for system-image-upgrader to do its job.
Change-Id: Ieca4e433d23574b82dc62c5368eed9dd93bfd1f5