gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/image/repart: allow replacing /nix/store

Browse Source
This commit is contained in:
Vincent Haupert
2025-09-14 22:24:12 +02:00
parent 9212727496
commit 973fbf96a4
4 changed files with 152 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/image/amend-repart-definitions.py
View File

@@ -36,11 +36,11 @@ def add_contents_to_definition(
def add_closure_to_definition(
definition: Path, closure: Path | None, strip_nix_store_prefix: bool | None
definition: Path, closure: Path | None, nix_store_prefix: str | None
) -> None:
"""Add CopyFiles= instructions to a definition for all paths in the closure.
If strip_nix_store_prefix is True, `/nix/store` is stripped from the target path.
Replace `/nix/store` with the value of nix_store_prefix.
"""
if not closure:
return
@@ -52,10 +52,12 @@ def add_closure_to_definition(
continue
source = Path(line.strip())
target = str(source.relative_to("/nix/store/"))
target = f":/{target}" if strip_nix_store_prefix else ""
option = f"CopyFiles={source}"
if nix_store_prefix:
target = nix_store_prefix / source.relative_to("/nix/store/")
option = f"{option}:{target}"
copy_files_lines.append(f"CopyFiles={source}{target}\n")
copy_files_lines.append(f"{option}\n")
with open(definition, "a") as f:
f.writelines(copy_files_lines)
@@ -102,8 +104,8 @@ def main() -> None:
add_contents_to_definition(definition, contents)
closure = config.get("closure")
strip_nix_store_prefix = config.get("stripNixStorePrefix")
add_closure_to_definition(definition, closure, strip_nix_store_prefix)
nix_store_prefix = config.get("nixStorePrefix")
add_closure_to_definition(definition, closure, nix_store_prefix)
print(target_dir.absolute())