vms/create: use tmpdir again

This commit is contained in:
Jörg Thalheim
2023-10-31 13:47:28 +01:00
parent f33ed3eec6
commit 81e40ac34c

View File

@@ -5,6 +5,7 @@ import os
import re
import shlex
import sys
import tempfile
from pathlib import Path
from typing import Iterator
from uuid import UUID
@@ -76,11 +77,13 @@ class BuildVmTask(BaseTask):
validate_path(clan_flakes_dir(), flake_dir)
flake_dir.mkdir(exist_ok=True)
xchg_dir = flake_dir / "xchg"
with tempfile.TemporaryDirectory() as tmpdir_:
tmpdir = Path(tmpdir_)
xchg_dir = tmpdir / "xchg"
xchg_dir.mkdir(exist_ok=True)
secrets_dir = flake_dir / "secrets"
secrets_dir = tmpdir / "secrets"
secrets_dir.mkdir(exist_ok=True)
disk_img = f"{flake_dir}/disk.img"
disk_img = tmpdir / "disk.img"
env = os.environ.copy()
env["CLAN_DIR"] = str(self.vm.flake_url)
@@ -120,7 +123,7 @@ class BuildVmTask(BaseTask):
"create",
"-f",
"raw",
disk_img,
str(disk_img),
"1024M",
],
)
@@ -134,7 +137,7 @@ class BuildVmTask(BaseTask):
"mkfs.ext4",
"-L",
"nixos",
disk_img,
str(disk_img),
],
)
)