recovery zip: support twrp.fstab filename in addition to recovery.fstab (fix for compatibility with TWRP on sony-yuga)

Fixes #1636 (closed)

Fixes a broken error message (instead of checking for code 255 just check for any error code).

TWRP 3.2.0 uses "twrp.fstab" instead of "recovery.fstab", this fix makes pmbootstrap support both.

Tested on samsung-kminilte with TWRP 3.2.3(twrp.fstab) and 3.1.1(recovery.fstab). I verified the files are actually named that way in /etc for both versions.

changed the description

By Martin on 2018-08-11T18:09:23

Note that the TWRP change this MR fixes, isn't specific for 3.2.0 but I guess more for the specific device. At Akademy we flashed postmarketOS through TWRP 3.2.1 on a Nexus 5, and it worked without this MR without any issues.

I don't think it matters much and we should probably still want this change, but maybe the naming is a bit wrong.

By Bart Ribbers on 2018-08-14T09:16:13

added 1 commit

• 4f13c641 - Change comment wording to be more accurate

Compare with previous version

By Martin on 2018-08-14T09:50:27

added 1 commit

• 9fa03370 - Fix indentation

Compare with previous version

By Martin on 2018-08-14T09:54:27

Tried with yuga on 3.2.3, which has recovery.fstab. It apparently is device specific.

I edited the comment in code.

By Martin on 2018-08-14T10:37:30

Thank you very much for the merge request @C0rn3j, added two comments.

By Oliver Smith on 2018-08-14T16:57:47

Oh and because the initial commit description is confusing (turned out it's not TWRP version related, but device specific), could you please squash the commits and give them a new commit message?

By Oliver Smith on 2018-08-14T16:58:59

changed title from Support TWRP 3.2.0+ to recovery zip: support twrp.fstab filename in addition to recovery.fstab (fix for compatibility with TWRP on sony-yuga)

By Oliver Smith on 2018-08-14T17:01:49

added 1 commit

• 71a44aa2 - Support devices with fstab named twrp.fstab instead of recovery.fstab

Compare with previous version

By Martin on 2018-08-16T13:26:18

resolved all discussions

By Martin on 2018-08-16T13:27:40

All should be OK now, MR marked as squash on pull.

By Martin on 2018-08-16T13:30:24

mentioned in issue #1612 (closed)

By Oliver Smith on 2018-08-16T20:43:02

added 17 commits

• 71a44aa2...86bc0cf5 - 13 commits from branch postmarketOS:master
• 644c04f9 - Support TWRP 3.2.0+
• 871cd626 - Change comment wording to be more accurate
• 342275f1 - Fix indentation
• 17f360d0 - Support devices with fstab named twrp.fstab instead of recovery.fstab

Compare with previous version

By Oliver Smith on 2018-08-16T21:16:36

Thank you very much! Code looks good now, and I have verified that it's still working as expected on my Nexus 4 (lg-mako).

By Oliver Smith on 2018-08-16T21:18:47

approved this merge request

By Oliver Smith on 2018-08-16T21:18:57

enabled an automatic merge when the pipeline for 17f360d0 succeeds

By Oliver Smith on 2018-08-16T21:19:19

merged

By Oliver Smith on 2018-08-16T21:21:46

A small thing I noticed just now, you wrote "(fix for compatibility with TWRP on sony-yuga)" in the title but it actually fixes samsung-kminilte.

Yuga has recovery.fstab only.

Not that it matters that much.

By Martin on 2018-08-16T21:24:52

mentioned in issue #1634 (closed)

By Oliver Smith on 2018-08-23T00:30:05