particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild: work around systemd-nspawn "cleaning" the hostname

Browse source
This commit is contained in:
Lars Karlitski 2019-06-12 18:15:02 +02:00
parent 72f10e184c
commit 6ad3a3b039
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
osbuild
View file

@ -54,10 +54,18 @@ def main(pipeline_path, input_dir, output_dir, sit):
options = stage.get("options", {})
options["tree"] = "/tmp/tree"
# systemd-nspawn silently removes some characters when choosing a
# machine name from the directory name. The only one relevant for
# us is '_', because all other characters used by
# TemporaryDirectory() are allowed. Replace it with 'L's
# (TemporaryDirectory() only uses lower-case characters)
machine_name = os.path.basename(root).replace("_", "L")
argv = ["systemd-nspawn",
"--as-pid2",
"--link-journal=no",
"--volatile=yes",
f"--machine={machine_name}",
f"--directory={root}",
f"--bind={tree}:/tmp/tree",
f"--bind={os.getcwd()}/run-stage:/tmp/run-stage",
@ -85,7 +93,7 @@ def main(pipeline_path, input_dir, output_dir, sit):
print()
print(f"{RESET}{BOLD}{i}. {name}{RESET} {options_str}")
print("Inspect with:")
print(f"\t# nsenter -a --wd=/root -t `machinectl show {os.path.basename(root)} -p Leader --value`")
print(f"\t# nsenter -a --wd=/root -t `machinectl show {machine_name} -p Leader --value`")
print()
try: