From 3589a3be1527f8bd98ecd5d618148401c0fcdc45 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Fri, 15 Nov 2024 20:22:14 -0500
Subject: [PATCH] main/postmarketos-initramfs: fix filesystem detection regex
(MR 5812)
Changes the regex of the initramfs to make sure that it is searching for
filesystem type instead of any type (eg partition scheme type).
---
main/postmarketos-initramfs/APKBUILD | 4 ++--
main/postmarketos-initramfs/init_functions.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/main/postmarketos-initramfs/APKBUILD b/main/postmarketos-initramfs/APKBUILD
index 1940fc9f279..963bdde496c 100644
--- a/main/postmarketos-initramfs/APKBUILD
+++ b/main/postmarketos-initramfs/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Caleb Connolly <caleb@postmarketos.org>
# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=postmarketos-initramfs
-pkgver=3.4.4
+pkgver=3.4.5
pkgrel=0
pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
url="https://postmarketos.org"
@@ -106,7 +106,7 @@ sha512sums="
c0233d22858a5901db64e1d2fe1f6d39a2e2cfd1b94a10932483f55fed9461e9b8aa2d73b154b9d99a7a8b49ee02abfbddfe917ce0c6d7576601ba2668589c01 00-initramfs-base.files
d0f35562365756d93066ce45924d17fb347b54095179c3262daa2f073e12743505cd5d9372ad30485915ca754d95a8edba9a74314e7949e0b3cf6978a87d03a5 00-initramfs-extra-base.files
966284e8ef8f840258a84019db4a6ddd436cdc50193e0673532f70fef86a6e4c1bfd21b682f3708251b6b670ca569c90016926d0926babc5a0257bb33ae55d79 init.sh
-eab20e07a632f814a1b36426a7b4087ac9195c9ed7cb22fb0b386b93a5be07c0b1a677e228d7bf3ff8e6d5e4307596848f743aec25d138d1a6625b3d885e0454 init_functions.sh
+522e3e52921ad7e9ab689f37888ac439583bab2ee73455508262fbcbe06a85a8f3be753518f2706c5d20bb56ae28587cd61ac23e6602a7f17758147d4b6e3fe0 init_functions.sh
18a0ca97bca094aeb8cb1c2582205ac0aff131085c39f1715246541cacfb35434aba515cd5d338703843efb36b9effd494a51361c51fb39be6052ad866346d3d init_2nd.sh
30fb52456376020e70116169752582d25a011a858111a347c2e53eccaddea8765fab502371cfdc0c2a8ca93034795b7e689e4cd3393ad601268c02024c4e84ab init_functions_2nd.sh
675e7d5bee39b2df7d322117f8dcaccc274d61beaf4d50ead19bbf2109446d64b1c0aa0c5b4f9846eb6c1c403418f28f6364eff4537ba41120fbfcbc484b7da7 mdev.conf
diff --git a/main/postmarketos-initramfs/init_functions.sh b/main/postmarketos-initramfs/init_functions.sh
index 88990e7dbf6..8f1ff4432db 100644
--- a/main/postmarketos-initramfs/init_functions.sh
+++ b/main/postmarketos-initramfs/init_functions.sh
@@ -346,7 +346,7 @@ find_boot_partition() {
get_partition_type() {
partition="$1"
- blkid "$partition" | sed 's/^.*TYPE="\([a-zA-z0-9_]*\)".*$/\1/'
+ blkid "$partition" | sed 's/^.*\ TYPE="\([a-zA-z0-9_]*\)".*$/\1/'
}
# $1: partition
--
GitLab