From e439c02a0a67117543f17bb39cb1a0a973d4074f Mon Sep 17 00:00:00 2001 From: Rudra Saraswat Date: Fri, 3 Apr 2026 22:42:22 +0100 Subject: [PATCH] fix: typos in /boot replacement logic --- usr/lib/akshara/classes/rootfs.py | 2 +- usr/lib/akshara/utils/update.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/usr/lib/akshara/classes/rootfs.py b/usr/lib/akshara/classes/rootfs.py index 7720f74..5c927a5 100644 --- a/usr/lib/akshara/classes/rootfs.py +++ b/usr/lib/akshara/classes/rootfs.py @@ -37,7 +37,7 @@ class RootFS: **kwargs: Keyword arguments list for subprocess.run(). """ - for dir in ("sys, proc", "dev"): + for dir in ("sys", "proc", "dev"): subprocess.run( ["mount", "--bind", f"/{dir}", os.path.join(self.rootfs_path, dir)] ) diff --git a/usr/lib/akshara/utils/update.py b/usr/lib/akshara/utils/update.py index 50722f3..75864e4 100644 --- a/usr/lib/akshara/utils/update.py +++ b/usr/lib/akshara/utils/update.py @@ -18,8 +18,9 @@ def update_cleanup() -> None: for path in ( "/etc/grub.d", "/etc/default/grub", - "/var/cache/akshara/rootfs/dev", + "/var/cache/akshara/rootfs/sys", "/var/cache/akshara/rootfs/proc", + "/var/cache/akshara/rootfs/dev", "/var/cache/akshara/rootfs/var/cache/blendOS", ): subprocess.run( @@ -145,6 +146,7 @@ def merge_var(new_rootfs: RootFS, overrides_keep_new: dict) -> None: def handle_boot(new_rootfs, boot_config) -> None: """Handles /boot partition.""" + subprocess.run(["rm", "-rf", "/.tmp.boot"]) subprocess.run(["cp", "-ax", os.path.join(str(new_rootfs), "boot"), "/.tmp.boot"]) if boot_config["type"] == "bios": @@ -207,7 +209,7 @@ def handle_boot(new_rootfs, boot_config) -> None: # Replace /boot with /.tmp.boot # FIXME: should be atomic for tmp_boot, dirs, files in os.walk("/.tmp.boot"): - boot = tmp_boot.replace("/tmp.boot", "/boot", 1) + boot = tmp_boot.replace("/.tmp.boot", "/boot", 1) subprocess.run(["mkdir", "-p", boot]) for path in dirs + files: subprocess.run(["rm", "-rf", "--", os.path.join(boot, path)])