From ec8d6cf988e76d580c4399232b41110209ae8c7b Mon Sep 17 00:00:00 2001
From: tohurtv <tohur@rakuos.org>
Date: Tue, 18 Nov 2025 23:04:04 -0700
Subject: [PATCH] fix sub volumes

---
 calamares/modules/fstab.conf        | 12 +++++++++---
 calamares/modules/mount.conf        |  4 ++--
 calamares/modules/welcome.conf      |  6 +++---
 debian/changelog                    |  4 ++--
 helpers/calamares-bootloader-config |  2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/calamares/modules/fstab.conf b/calamares/modules/fstab.conf
index a5e5a9b..6105dda 100644
--- a/calamares/modules/fstab.conf
+++ b/calamares/modules/fstab.conf
@@ -1,12 +1,18 @@
 ---
 mountOptions:
-    default: defaults,noatime
-    btrfs: defaults,realtime,space_cache=v2,autodefrag,compress=zstd:3
+    - filesystem: default
+      options: [ defaults ]
+    - filesystem: efi
+      options: [ defaults, umask=0077 ]
+    - filesystem: btrfs
+      options: [ defaults, compress=zstd:1 ]
+    - filesystem: btrfs_swap
+      options: [ defaults, noatime ]
 
 ssdExtraMountOptions:
     ext4: discard
     jfs: discard
     xfs: discard
     swap: discard
-    btrfs: discard,compress=lzo
+    btrfs: discard,compress=zstd:1
 crypttabOptions: luks,discard,keyscript=/bin/cat
diff --git a/calamares/modules/mount.conf b/calamares/modules/mount.conf
index 02042e4..f8f023c 100644
--- a/calamares/modules/mount.conf
+++ b/calamares/modules/mount.conf
@@ -48,9 +48,9 @@ btrfsSubvolumes:
       subvolume: /@
     - mountPoint: /home
       subvolume: /@home
-    - mountPoint: /root
-      subvolume: /@root
     - mountPoint: /var
       subvolume: /@var
+    - mountPoint: /var/cache
+      subvolume: /@cache
     - mountPoint: /var/log
       subvolume: /@log
diff --git a/calamares/modules/welcome.conf b/calamares/modules/welcome.conf
index ee36aaa..5d9fde8 100644
--- a/calamares/modules/welcome.conf
+++ b/calamares/modules/welcome.conf
@@ -1,7 +1,7 @@
 ---
-showSupportUrl:         true
-showKnownIssuesUrl:     true
-showReleaseNotesUrl:    true
+showSupportUrl:         false
+showKnownIssuesUrl:     false
+showReleaseNotesUrl:    false
 
 requirements:
     requiredStorage:    15
diff --git a/debian/changelog b/debian/changelog
index 020b02b..4e73d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-calamares-settings-rakuos (1.2.2-1rakuos6) UNRELEASED; urgency=medium
+calamares-settings-rakuos (1.2.3-1rakuos1) UNRELEASED; urgency=medium
 
   * First fork
   * Set btrfs as default filesystem 
   * 
 
- -- Tohur <tohur@Josh-PC>  Mon, 17 Nov 2025 08:30:08 -0700
+ -- Tohur <tohur@rakuos.org>  Mon, 17 Nov 2025 08:30:08 -0700
diff --git a/helpers/calamares-bootloader-config b/helpers/calamares-bootloader-config
index ff317d9..57c6f14 100755
--- a/helpers/calamares-bootloader-config
+++ b/helpers/calamares-bootloader-config
@@ -31,5 +31,5 @@ if [ "$FS_TYPE" = "btrfs" ]; then
     echo " * Btrfs detected nothing to do"
 else
     echo " * Not a Btrfs filesystem, removing snapper, btrfs-assistant"
-    chroot "$CHROOT" apt-get -y purge snapper btrfs-assistant
+    DEBIAN_FRONTEND=noninteractive chroot "$CHROOT" apt-get -y purge snapper btrfs-assistant
 fi