fix

1 files changed, 0 insertions, 11 deletions

diff --git a/raveos-calamares-theme/etc/calamares/modules/calamares-normalize-subvolumes.sh b/raveos-calamares-theme/etc/calamares/modules/calamares-normalize-subvolumes.sh
index 83b42c4..8e68e50 100644
--- a/raveos-calamares-theme/etc/calamares/modules/calamares-normalize-subvolumes.sh
+++ b/raveos-calamares-theme/etc/calamares/modules/calamares-normalize-subvolumes.sh
@@ -11,12 +11,6 @@ if [ "$ROOT_FS" != "btrfs" ]; then
   exit 0
 fi
 
-# Calamares' partition module ignores our btrfsSubvolumes config entirely
-# and always creates its own hardcoded set: @, @home, @root, @srv, @cache,
-# @log, @tmp. We only want @, @home, @log, @pkg (just /var/cache/pacman/pkg,
-# not all of /var/cache) and @snapshots (created separately). Drop the rest
-# here, after everything else has already run, merging any content back
-# into the parent (@) subvolume first.
 
 mkdir -p /mnt/topvol
 mount -o subvolid=5 "${ROOT_DEV}" /mnt/topvol
@@ -40,8 +34,6 @@ for entry in "root:@root" "srv:@srv" "var/tmp:@tmp"; do
   if findmnt -no SOURCE "$path" >/dev/null 2>&1; then
     echo ">>> [subvol-normalize] Removing separate subvolume ${subvol} (${path})"
     unmount_retry "$path"
-    # $path is now a plain empty dir in @ again -- copy the old
-    # subvolume's content back into it before deleting the subvolume.
     if [ -d "/mnt/topvol/${subvol}" ] && ! findmnt -no SOURCE "$path" >/dev/null 2>&1; then
       cp -a "/mnt/topvol/${subvol}/." "$path/" 2>/dev/null || true
       btrfs subvolume delete "/mnt/topvol/${subvol}" || true
@@ -50,9 +42,6 @@ for entry in "root:@root" "srv:@srv" "var/tmp:@tmp"; do
   sed -i "\#[[:space:]]${path}[[:space:]]#d" /etc/fstab
 done
 
-# Narrow /var/cache: drop the whole-@cache subvolume (keep it as a plain
-# directory), and create a dedicated @pkg subvolume just for pacman's
-# package cache -- that's the only part of /var/cache archinstall separates.
 if findmnt -no SOURCE /var/cache >/dev/null 2>&1; then
   echo ">>> [subvol-normalize] Narrowing /var/cache -> only pacman/pkg as @pkg"
   unmount_retry /var/cache