1 files changed, 21 insertions, 10 deletions
diff --git a/raveos-calamares-theme/etc/calamares/modules/partition.conf b/raveos-calamares-theme/etc/calamares/modules/partition.conf
index f73a24e..732a5df 100644
--- a/raveos-calamares-theme/etc/calamares/modules/partition.conf
+++ b/raveos-calamares-theme/etc/calamares/modules/partition.conf
@@ -169,16 +169,16 @@ availableFileSystemTypes:  ["ext4","btrfs"]
 # 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"
+    - 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
@@ -239,6 +239,17 @@ btrfsSubvolumes:
 #         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