forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

pmos-base: skip failures in devmappings.initd (!164)

Browse source 
Continue even if some kpartx commands fail. This is necessary for the
htc vision and perhaps other devices.
This commit is contained in:
Matthias Berndt 2019-01-21 20:11:21 +01:00 committed by Oliver Smith
parent 99700879f3
commit f0f6db1bae
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/postmarketos-base/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname=postmarketos-base
pkgver=3
pkgrel=20
pkgrel=21
pkgdesc="Meta package for minimal postmarketOS base"
url="https://postmarketos.org"
arch="noarch"
@ -75,4 +75,4 @@ a525bd9716aff2ded60ae5e6f7c369d73b03d984b09f12e65d32e2fb3f1538ca0e330752b2c55df6
3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7 swapfile
f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819 swapfile.init
e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53 swapfile.conf
aa93a0e664354bbcfdfc7dc35fdbf5f31d5e8866d0d8e5c2374e9e87fa146e7afc45294d6eabb4d7b5f28bca608e0366ebbc8d1677a8746677d5075c1d44610d devmappings.initd"
dadd251229eb5759e3cba77c39a4afc6f28bcbe0f272cd3ab41b7ff4fe6a3d2b9ee765e1a0b8f9241274e757ed3b2ce035ee5abe91843e55fb4188a3c401ca78 devmappings.initd"

6
main/postmarketos-base/devmappings.initd
View file

@ -15,7 +15,11 @@ start()
case "$(kpartx -l "$partition" 2>/dev/null | wc -l)" in
2)
einfo "Mount subpartitions of $partition"
kpartx -afs "$partition"
# On some devices (e. g. htc vision) this kpartx command can fail
# with a non-zero exit code on some unrelated partitions, which would
# normally cause the loop to abort. But we still need to find the
# root partition, hence the "|| continue"
kpartx -afs "$partition" || continue
# Ensure that this was the *correct* subpartition
# Some devices have mmc partitions that appear to have
# subpartitions, but aren't our subpartition.