From 0922ff0fddf3873e71b5df9aabe3c130e381de59 Mon Sep 17 00:00:00 2001
From: Marian Stramm <m.stramm@speedcoding.de>
Date: Sun, 2 Jan 2022 17:51:52 +0100
Subject: [PATCH] main/postmarketos-mkinitfs: basic support for btrfs, upgrade
 to 1.4.1 (MR 2841)

[ci:skip-build] already built successfully in CI
---
 main/postmarketos-mkinitfs/00-default.modules |  1 +
 main/postmarketos-mkinitfs/APKBUILD           |  9 +++++----
 main/postmarketos-mkinitfs/init_functions.sh  | 14 ++++++++++++++
 pmaports.cfg                                  |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/main/postmarketos-mkinitfs/00-default.modules b/main/postmarketos-mkinitfs/00-default.modules
index 8f36ff762..00ec6a966 100644
--- a/main/postmarketos-mkinitfs/00-default.modules
+++ b/main/postmarketos-mkinitfs/00-default.modules
@@ -6,3 +6,4 @@ xts
 libaes
 aes
 evdev
+btrfs
diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD
index 155133b49..bfc8f8788 100644
--- a/main/postmarketos-mkinitfs/APKBUILD
+++ b/main/postmarketos-mkinitfs/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-mkinitfs
-pkgver=1.3
+pkgver=1.4.1
 pkgrel=0
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
 depends="
 	boot-deploy
 	busybox-extras
+	btrfs-progs
 	bzip2
 	cryptsetup
 	device-mapper
@@ -67,8 +68,8 @@ check() {
 }
 
 sha512sums="
-3495c72ad5a8b1287c4a696a2f9f29b465faafa2768f6336d158aaeb577e352aaa1fc5ddcff35c70de460828094cbfa5e06d4b905565228c5706c151f54a09a8  postmarketos-mkinitfs-1.3.tar.gz
-950ac042f19055979cb53b39be93866c88aba0acd5a49cd768522505991e2bd2851735677e777caa6c8973e006318582ddd975214eccc5c35c2c1d649af6d71e  00-default.modules
+f827acb0a10c0e5c1631f1b712e91fde7eb4ade0f1174eb2ef1754018bf4518ea1ad3229fd335c25fb0c6fe46ae20890f5cf43e58c8143ae17b5ab9bb36f0199  postmarketos-mkinitfs-1.4.1.tar.gz
+08a3e79c6fa7d3839d43515b8da7817cb36f4ab014552fd0164957c232bb16fde337e57c47c9734d396a5fca3328fbf49ebabe4728c6071c80b04dad14886bba  00-default.modules
 0c6d2c749952ff027f1c435a7a3b2861fb632b81c16b6d69a92b47457da4af8cb80e50168b93f92b316377c8c1f5243029fca22ac49fef0940eb5ad6c3dff6ec  init.sh
-0f631fb08f44b3aaaf44649c164040a6effda2a921c4bfc6e1b55e265ce4395947a8620e669902d18e62f7eabae0e9ef2b88d2d985d6714d27db02eb8b412cc2  init_functions.sh
+201cd1112f8e5427d8570d87ff260ab492ea74863a1a8c46377438dfb31582c78ad20088168e36972100db1fc5729e9e625fb4d6c4c6bffe5c8ed33cba3ee1d8  init_functions.sh
 "
diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh
index 4d3937f40..d7da4751a 100644
--- a/main/postmarketos-mkinitfs/init_functions.sh
+++ b/main/postmarketos-mkinitfs/init_functions.sh
@@ -325,6 +325,15 @@ resize_root_filesystem() {
 				echo "Resize 'f2fs' root filesystem ($partition)"
 				resize.f2fs "$partition"
 				;;
+			btrfs)
+				echo "Resize 'btrfs' root filesystem ($partition)"
+				modprobe btrfs
+				resize_root_filesystem_tmp_btrfs="$(mktemp -d)"
+				mount -t btrfs "$partition" "$resize_root_filesystem_tmp_btrfs"
+				btrfs filesystem resize max "$resize_root_filesystem_tmp_btrfs"
+				umount "$resize_root_filesystem_tmp_btrfs"
+				unset resize_root_filesystem_tmp_btrfs
+				;;
 			*)	echo "WARNING: Can not resize '$type' filesystem ($partition)." ;;
 		esac
 		show_splash_loading
@@ -344,6 +353,11 @@ mount_root_partition() {
 			echo "Detected f2fs filesystem"
 			mount -t f2fs -o ro "$partition" /sysroot
 			;;
+		btrfs)
+			echo "Detected btrfs filesystem"
+			modprobe btrfs
+			mount -t btrfs -o ro "$partition" /sysroot
+			;;
 		*)	echo "WARNING: Detected '$type' filesystem ($partition)." ;;
 	esac
 	if ! [ -e /sysroot/usr ]; then
diff --git a/pmaports.cfg b/pmaports.cfg
index 839fdf3b4..bd25225ee 100644
--- a/pmaports.cfg
+++ b/pmaports.cfg
@@ -3,7 +3,7 @@
 version=7
 pmbootstrap_min_version=1.37.0
 channel=edge
-supported_root_filesystems=ext4,f2fs
+supported_root_filesystems=btrfs,ext4,f2fs
 supported_firewall=nftables
 supported_base_nofde=True
 supported_install_boot_label=pmOS_i_boot