From 55ac59e2b3a9aa89ed497dd6eae6626d58a0582c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= <lars@radicore.se>
Date: Sun, 9 Mar 2025 14:42:28 +0100
Subject: [PATCH] chore: add subvolumes state partition
---
pkgs/rootfs/mkrootfs.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/rootfs/mkrootfs.sh b/pkgs/rootfs/mkrootfs.sh
index 05a613b..9d1e621 100644
--- a/pkgs/rootfs/mkrootfs.sh
+++ b/pkgs/rootfs/mkrootfs.sh
@@ -90,10 +90,14 @@ cat <<EOF > $out/etc/repart.d/40-var.conf
[Partition]
Type=var
Format=btrfs
+MakeDirectories=/var/lib/confexts /var/.snapshots
MountPoint=/var
Label=patos-state
Encrypt=tpm2
EncryptedVolume=patos-state:none:tpm2-device=auto,luks,discard
+Subvolumes=/var/lib/confexts /var/.snapshots
+MountPoint=/var/lib/confexts:subvol=/var/lib/confexts
+MountPoint=/var/.snapshots:subvol=/var/.snapshots
SizeMinBytes=1G
Minimize=off
FactoryReset=yes
@@ -134,9 +138,6 @@ cp -P ${lvm2}/lib/udev/rules.d/* $out/usr/lib/udev/rules.d/
cp -Pr ${btrfs}/bin/* $out/usr/bin/
cp -Pr ${btrfs}/lib/* $out/usr/lib/
-##FIXME(remove later): install mkfs.erofs bin
-cp -P ${erofsUtils}/bin/mkfs.erofs $out/usr/bin/
-
### install tpm2 tools
# For TPM debugging
# cp -P ${tpm2Tools}/bin/* $out/usr/bin/
@@ -159,13 +160,12 @@ cp $out/usr/share/factory/etc/vconsole.conf $out/etc/
#Ephemeral machine-id until registration
ln -sf /run/machine-id $out/etc/machine-id
-
# remove pkgconfig
rm -rf $out/usr/lib/pkgconfig
### Find and install all shared libs
find $out -type f -executable -exec ldd {} \; | awk '{print $3}' | \
- grep -v util-linux-2 | grep -v systemd | grep -v glibc | grep -v tpm2 | grep -v devmapper | \
+ grep -v systemd | grep -v glibc | grep -v tpm2 | grep -v devmapper | \
sort -u | xargs -I {} cp {} $out/usr/lib/
find $out -type f -executable -exec chmod 755 {} \;