From 956ef6fb0105c2b10f22142252e2900847cb589e Mon Sep 17 00:00:00 2001
From: Rudra Saraswat <rs2009@ruds.io>
Date: Thu, 2 Apr 2026 01:03:52 +0100
Subject: [PATCH] fix: do not (mostly) handle /var/cache/blendOS explicitly

---
 usr/lib/akshara/classes/rootfs.py   | 30 -----------------------------
 usr/lib/akshara/utils/gen_rootfs.py |  8 +++++++-
 usr/lib/akshara/utils/update.py     |  2 ++
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/usr/lib/akshara/classes/rootfs.py b/usr/lib/akshara/classes/rootfs.py
index 2774b55..1306a12 100644
--- a/usr/lib/akshara/classes/rootfs.py
+++ b/usr/lib/akshara/classes/rootfs.py
@@ -31,33 +31,6 @@ class RootFS:
     def init(self) -> subprocess.CompletedProcess:
         """Initialise rootfs."""
 
-        # Create blendOS cache directory
-        Path("/var/cache/blendOS").mkdir(parents=True, exist_ok=True)
-        Path(os.path.join(self.rootfs_path, "var/cache/blendOS")).mkdir(
-            parents=True, exist_ok=True
-        )
-        # subprocess.run(
-        #     ["rm", "-rf", "--", os.path.join(self.rootfs_path, "var/cache/blendOS")]
-        # )
-        # subprocess.run(
-        #     [
-        #         "cp",
-        #         "-a",
-        #         "--",
-        #         "/var/cache/blendOS",
-        #         os.path.join(self.rootfs_path, "var/cache/blendOS"),
-        #     ]
-        # )
-
-        subprocess.run(
-            [
-                "mount",
-                "--bind",
-                "/var/cache/blendOS",
-                os.path.join(self.rootfs_path, "var/cache/blendOS"),
-            ]
-        )
-
         completedProcess = subprocess.run(
             ["bash", "-s"],
             text=True,
@@ -65,8 +38,6 @@ class RootFS:
             cwd=self.rootfs_path,
         )
 
-        subprocess.run(["umount", os.path.join(self.rootfs_path, "var/cache/blendOS")])
-
         return completedProcess
 
     def exec(self, cmd, **kwargs) -> subprocess.CompletedProcess:
@@ -81,7 +52,6 @@ class RootFS:
                 "systemd-nspawn",
                 "--quiet",
                 "--pipe",
-                "--bind=/var/cache/blendOS",
                 "-D",
                 self.rootfs_path,
             ]
diff --git a/usr/lib/akshara/utils/gen_rootfs.py b/usr/lib/akshara/utils/gen_rootfs.py
index a8090dd..eee1b1d 100644
--- a/usr/lib/akshara/utils/gen_rootfs.py
+++ b/usr/lib/akshara/utils/gen_rootfs.py
@@ -17,7 +17,13 @@ def gen_rootfs(system_config: dict, rootfs_path: str) -> RootFS:
     """Generates a rootfs for a given system configuration."""
 
     rootfs = RootFS(rootfs_path, system_config["distro-config"])
-    rootfs.init()
+
+    subprocess.run(
+        ["bash", "-s"],
+        text=True,
+        input=system_config["distro-config"]["before-stages"],
+        cwd=rootfs_path,
+    )
 
     modules = {}
 
diff --git a/usr/lib/akshara/utils/update.py b/usr/lib/akshara/utils/update.py
index ec7ad32..ade42cd 100644
--- a/usr/lib/akshara/utils/update.py
+++ b/usr/lib/akshara/utils/update.py
@@ -13,6 +13,8 @@ from .gen_rootfs import gen_rootfs
 
 def update_cleanup() -> None:
     """Clean-up from previous rebase/update."""
+
+    # FIXME: should not ideally handle /var/cache/blendOS explicitly
     subprocess.run(
         ["umount", "-l", "/var/cache/akshara/rootfs/var/cache/blendOS"],
         stdout=subprocess.DEVNULL,