summaryrefslogtreecommitdiff
path: root/raveos-calamares-theme/etc/calamares/modules/partition.conf
diff options
context:
space:
mode:
Diffstat (limited to 'raveos-calamares-theme/etc/calamares/modules/partition.conf')
-rw-r--r--raveos-calamares-theme/etc/calamares/modules/partition.conf33
1 files changed, 33 insertions, 0 deletions
diff --git a/raveos-calamares-theme/etc/calamares/modules/partition.conf b/raveos-calamares-theme/etc/calamares/modules/partition.conf
index b0a9951..732a5df 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.
@@ -217,6 +239,17 @@ availableFileSystemTypes: ["ext4","btrfs"]
# sectors-per-cluster: 128
# size: 100%
#
+
+# btrfsSubvolumes (above) is only honoured when a custom partitionLayout is
+# in effect -- Calamares' own hardcoded btrfs subvolume defaults are used
+# otherwise, even in plain "erase disk" automatic mode. "unknown" here means
+# the user's actual filesystem choice (ext4 or btrfs) is used, same as the
+# no-custom-layout default -- this just exists to make btrfsSubvolumes apply.
+partitionLayout:
+ - name: "rootfs"
+ filesystem: "unknown"
+ mountPoint: "/"
+ size: 100%
# There can be any number of partitions, each entry having the following attributes:
# - name: filesystem label
# and