diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-23 00:01:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-23 00:01:50 +0000 |
| commit | 84387348d4729bb3fda79a325f330f9e2ab38855 (patch) | |
| tree | 9e8560c7866ff42934b0ddc95dcfc3fa2e0e5c28 /nixos | |
| parent | 9d3574aaf7ea1f5829f2b3c77c6070091976b93d (diff) | |
| parent | eeefcf71c6205a1edb0070e3260b05cc80619023 (diff) | |
| download | nixlib-84387348d4729bb3fda79a325f330f9e2ab38855.tar nixlib-84387348d4729bb3fda79a325f330f9e2ab38855.tar.gz nixlib-84387348d4729bb3fda79a325f330f9e2ab38855.tar.bz2 nixlib-84387348d4729bb3fda79a325f330f9e2ab38855.tar.lz nixlib-84387348d4729bb3fda79a325f330f9e2ab38855.tar.xz nixlib-84387348d4729bb3fda79a325f330f9e2ab38855.tar.zst nixlib-84387348d4729bb3fda79a325f330f9e2ab38855.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/image/amend-repart-definitions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/image/amend-repart-definitions.py b/nixos/modules/image/amend-repart-definitions.py index 52f10303eb5e..fa9b1544ae85 100644 --- a/nixos/modules/image/amend-repart-definitions.py +++ b/nixos/modules/image/amend-repart-definitions.py @@ -53,7 +53,7 @@ def add_closure_to_definition( source = Path(line.strip()) target = str(source.relative_to("/nix/store/")) - target = f":{target}" if strip_nix_store_prefix else "" + target = f":/{target}" if strip_nix_store_prefix else "" copy_files_lines.append(f"CopyFiles={source}{target}\n") @@ -102,7 +102,7 @@ def main() -> None: add_contents_to_definition(definition, contents) closure = config.get("closure") - strip_nix_store_prefix = config.get("stripStorePaths") + strip_nix_store_prefix = config.get("stripNixStorePrefix") add_closure_to_definition(definition, closure, strip_nix_store_prefix) print(target_dir.absolute()) |