summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNippy <nippy@rp1.hu>2026-07-18 09:18:29 +0200
committerNippy <nippy@rp1.hu>2026-07-18 09:18:29 +0200
commit822d7085d47b00c0213011a2b95c70c35e1f380c (patch)
treef7fb87d70203bc29570344e044d2d5b42ce8db45
parent639f4872cffadc5df3687d0a31a63895ff8b5a0c (diff)
downloadRaveOS-PKGBUILD-822d7085d47b00c0213011a2b95c70c35e1f380c.tar.gz
RaveOS-PKGBUILD-822d7085d47b00c0213011a2b95c70c35e1f380c.zip
btrfs subvolume
-rw-r--r--raveos-calamares-theme/PKGBUILD2
-rw-r--r--raveos-calamares-theme/etc/calamares/modules/partition.conf22
2 files changed, 23 insertions, 1 deletions
diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD
index ef0933f..4346a1e 100644
--- a/raveos-calamares-theme/PKGBUILD
+++ b/raveos-calamares-theme/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: AlexC <alexc@alexc.hu>
pkgname=raveos-calamares-theme
pkgver=2.0.0
-pkgrel=40
+pkgrel=41
pkgdesc="RaveOS Calamares Theme"
arch=('any')
url="https://git.rp1.hu/RaveOS"
diff --git a/raveos-calamares-theme/etc/calamares/modules/partition.conf b/raveos-calamares-theme/etc/calamares/modules/partition.conf
index b0a9951..f73a24e 100644
--- a/raveos-calamares-theme/etc/calamares/modules/partition.conf
+++ b/raveos-calamares-theme/etc/calamares/modules/partition.conf
@@ -158,6 +158,28 @@ defaultFileSystemType: "ext4"
# warning (this matches traditional no-choice-available behavior best).
availableFileSystemTypes: ["ext4","btrfs"]
+# Btrfs subvolume layout, used whenever btrfs is picked (erase mode).
+#
+# Without this, Calamares falls back to a single flat "@" subvolume for
+# the whole root filesystem -- no separate @home/@log/@pkg, and no
+# @.snapshots. That breaks tools that expect the standard Arch layout
+# (e.g. grub-btrfs, which looks for snapshot subvolumes to build its GRUB
+# submenu, and Snapper, which is picky about which subvolume it manages).
+#
+# This mirrors archinstall's default btrfs layout, see:
+# https://gitlab.archlinux.org/archlinux/archinstall/-/blob/master/archinstall/lib/disk/disk_menu.py
+btrfsSubvolumes:
+ - mountPoint: "/"
+ subvolume: "/@"
+ - mountPoint: "/home"
+ subvolume: "/@home"
+ - mountPoint: "/var/log"
+ subvolume: "/@log"
+ - mountPoint: "/var/cache/pacman/pkg"
+ subvolume: "/@pkg"
+ - mountPoint: "/.snapshots"
+ subvolume: "/@snapshots"
+
# Show/hide LUKS related functionality in automated partitioning modes.
# Disable this if you choose not to deploy early unlocking support in GRUB2
# and/or your distribution's initramfs solution.