From e5feee5cc404b4997c8e6e2fb8389fb94e579c13 Mon Sep 17 00:00:00 2001 From: jane400 Date: Tue, 17 Sep 2024 10:41:51 +0200 Subject: [PATCH] main/postmarketos-initramfs-minimal: don't check btrfs (MR 5605) Partially reverts: aed9243c65fbacd7510beed7a7df7c84705e4153 (MR5238) [ci:skip-build]: already built successfully in CI --- main/postmarketos-initramfs-minimal/APKBUILD | 4 ++-- main/postmarketos-initramfs-minimal/init_functions.sh | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/main/postmarketos-initramfs-minimal/APKBUILD b/main/postmarketos-initramfs-minimal/APKBUILD index 55db07287..c3bd50bb8 100644 --- a/main/postmarketos-initramfs-minimal/APKBUILD +++ b/main/postmarketos-initramfs-minimal/APKBUILD @@ -2,7 +2,7 @@ # only be used on devices that do not have space for the full size ramdisk. pkgname=postmarketos-initramfs-minimal pkgver=2.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="Deprecated minimal initramfs for space constrained devices" url="https://postmarketos.org" options="!check" # no tests @@ -92,7 +92,7 @@ sha512sums=" ab41b45b0613f25a61114ed8c8b92bc53c60838f6e2e0ba18c76e5369b2984e6023a0661887692673aca3f647f268c468a468f6b1ac424cfee609017a89481dd 00-initramfs-base.files 4129c444aae613c8a10a2e87c4485482d0023e665581f804c5f0b9f76e2dd6fec3c78d02af07672b1d9eeacfdcd32c8eb5adc2f5677b8774c74d0ee631d950bd 00-initramfs-extra-base.files 102cb49a5b44282afee7808945c69e9bb9310677efeefc681d92217f0399a90fcbb37eb9ac7aed89cc27c324780298c7c2de6de2bdb89a77499faad1c312e539 init.sh -4d08617c98c83cd47baf820bb536e3003cc983218f20291ec9f201415fe84e0968a819e8ed2d0ae8a9b717b58ca0a534d7796190bd3b704b76afc1f263dae911 init_functions.sh +3e3cb29eabf9ee4c8dbd7ff2366aa8cea5f44b11b04df060d7841e9b8f25c85f0a2b19838b177a8b651f2b3c8b69135d36603534382c54736596d0bfa429ed87 init_functions.sh ba3275a9af788c7c782322a22a0f144d5e50e3498ea6886486a29331f23ae89cd32d500a3635cfa7cab369afba92edc18aeca64ccbf0cd589061cce23d15b46c unudhcpd.conf 675e7d5bee39b2df7d322117f8dcaccc274d61beaf4d50ead19bbf2109446d64b1c0aa0c5b4f9846eb6c1c403418f28f6364eff4537ba41120fbfcbc484b7da7 mdev.conf " diff --git a/main/postmarketos-initramfs-minimal/init_functions.sh b/main/postmarketos-initramfs-minimal/init_functions.sh index f6a5d1eaf..f650f782a 100644 --- a/main/postmarketos-initramfs-minimal/init_functions.sh +++ b/main/postmarketos-initramfs-minimal/init_functions.sh @@ -325,12 +325,6 @@ check_filesystem() { partition="$1" type="$(get_partition_type "$partition")" case "$type" in - btrfs) - echo "Check 'btrfs' root filesystem ($partition)" - if ! btrfs check --readonly "$partition" ; then - status="fail" - fi - ;; ext*) echo "Auto-repair and check 'ext' filesystem ($partition)" e2fsck -p "$partition"