fix: /var/lib handling

This commit is contained in:
Rudra Saraswat 2026-04-01 22:15:01 +01:00
parent 78dcb775a5
commit 8f5e52db05

View file

@ -90,8 +90,9 @@ def merge_var(new_rootfs: RootFS, overrides_keep_new: dict) -> None:
new_rootfs: Path to rootfs.
overrides_keep_new: Dictionary comprising overrides and whether to keep new.
"""
subprocess.run(["mv", f"{new_rootfs}/var", f"{new_rootfs}/usr/var"])
subprocess.run(["cp", "-ax", "/var", f"{new_rootfs}/var"])
subprocess.run(["cp", "-ax", f"{new_rootfs}/var", f"{new_rootfs}/usr/var"])
subprocess.run(["rm", "-rf", f"{new_rootfs}/var/lib"])
subprocess.run(["cp", "-ax", "/var/lib", f"{new_rootfs}/var/lib"])
var_lib_diff = filecmp.dircmp(
f"{new_rootfs}/usr/var/lib/", f"{new_rootfs}/var/lib/"