Merge pull request #246941 from yaxitech/image-amend-repart-r13y

This commit is contained in:
Ryan Lahfa 2023-08-03 15:57:24 +02:00 committed by GitHub
commit 2a1f1797be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,8 +15,6 @@ files using the same mechanism.
import json import json
import sys import sys
import shutil import shutil
import os
import tempfile
from pathlib import Path from pathlib import Path
@ -92,12 +90,13 @@ def main() -> None:
print("Partition config is empty.") print("Partition config is empty.")
sys.exit(1) sys.exit(1)
temp = tempfile.mkdtemp() target_dir = Path("amended-repart.d")
shutil.copytree(repart_definitions, temp, dirs_exist_ok=True) target_dir.mkdir()
shutil.copytree(repart_definitions, target_dir, dirs_exist_ok=True)
for name, config in partition_config.items(): for name, config in partition_config.items():
definition = Path(f"{temp}/{name}.conf") definition = target_dir.joinpath(f"{name}.conf")
os.chmod(definition, 0o644) definition.chmod(0o644)
contents = config.get("contents") contents = config.get("contents")
add_contents_to_definition(definition, contents) add_contents_to_definition(definition, contents)
@ -106,7 +105,7 @@ def main() -> None:
strip_nix_store_prefix = config.get("stripStorePaths") strip_nix_store_prefix = config.get("stripStorePaths")
add_closure_to_definition(definition, closure, strip_nix_store_prefix) add_closure_to_definition(definition, closure, strip_nix_store_prefix)
print(temp) print(target_dir.absolute())
if __name__ == "__main__": if __name__ == "__main__":