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

main/postmarketos-mkinitfs: support pmOS_i_boot (MR 2337)

Browse source 
Support the shorter label for the installer's boot partition, that works
with the 11 character limit of fat32 partitions.
This commit is contained in:
Oliver Smith 2021-07-11 18:09:52 +02:00 committed by Dylan Van Assche
parent f894697637
commit 7139a82837
No known key found for this signature in database
GPG key ID: 8642571587897EA1
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/postmarketos-mkinitfs/APKBUILD
View file

@ -1,6 +1,6 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org> # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=postmarketos-mkinitfs pkgname=postmarketos-mkinitfs
pkgver=0.27 pkgver=0.28
pkgrel=0 pkgrel=0
pkgdesc="Tool to generate initramfs images for postmarketOS" pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://postmarketos.org" url="https://postmarketos.org"
@ -54,7 +54,7 @@ check() {
sha512sums=" sha512sums="
4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b5065655457e34f5952126bac6ab45143a91cddb09a8ad2d0a55c5cecd564a0135 00-default.modules 4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b5065655457e34f5952126bac6ab45143a91cddb09a8ad2d0a55c5cecd564a0135 00-default.modules
1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67 init.sh.in 1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67 init.sh.in
393791a7db328d45db7c3b7836ed93208f8b64a6c08a219d31f5a51a167b75ac32407179ae33ef3f72e33fae35c48f676cf526dae190b231d1a766b9a0ad0fb6 init_functions.sh daf8bbc02e0dc18dda653d1b25cac985c5ff66568eec7a379857b606843b94f03855d47ded2aff801015ec3c9e2cf90f646dc7deaaef23d373c2ff2b9bbfa435 init_functions.sh
54c8ea6c4b5313c0ca82bbc40498a35d4b5cbcdbf950dc01b5025238ea6b8caa2f9a9ee57a269fb78673fbcac186c33243188458ecda45deb3354d5d8a77fdfe mkinitfs.sh 54c8ea6c4b5313c0ca82bbc40498a35d4b5cbcdbf950dc01b5025238ea6b8caa2f9a9ee57a269fb78673fbcac186c33243188458ecda45deb3354d5d8a77fdfe mkinitfs.sh
6b8de5dc13aef9c8090bc4e307b142887e4e3bf1851fe498845be64f7d1ba65d243c1bcb29fbd1b108be2a5067349be1461838573505c9d23e06a680265a4ec3 mkinitfs_functions.sh 6b8de5dc13aef9c8090bc4e307b142887e4e3bf1851fe498845be64f7d1ba65d243c1bcb29fbd1b108be2a5067349be1461838573505c9d23e06a680265a4ec3 mkinitfs_functions.sh
c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh

8
main/postmarketos-mkinitfs/init_functions.sh
View file

@ -162,7 +162,13 @@ find_boot_partition() {
echo "${x#pmos_boot=}" echo "${x#pmos_boot=}"
return return
done done
findfs LABEL="pmOS_inst_boot" || findfs LABEL="pmOS_boot"
# * "pmOS_i_boot" installer boot partition (fits 11 chars for fat32)
# * "pmOS_inst_boot" old installer boot partition (backwards compat)
# * "pmOS_boot" boot partition after installation
findfs LABEL="pmOS_i_boot" \
|| findfs LABEL="pmOS_inst_boot" \
|| findfs LABEL="pmOS_boot"
} }
# $1: path # $1: path