Skip to content

Commit c61b237

Browse files
committed
fix(backend): seed iso path
1 parent f175f10 commit c61b237

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

backend/app/core/xml_builder.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from lxml import etree
22
from app.models.vm import VmCreateXML
3-
from app.core.constants import VMS_DIR
3+
from app.core.constants import VMS_DIR, IMAGES_DIR
44
from app.core.config import VIRT_TYPE
55

66
LAYOUT_TO_KEYMAP = {
@@ -75,10 +75,11 @@ def build_xml(vm_read: VmCreateXML):
7575

7676
disk_seed = etree.SubElement(devices, "disk", type="file", device="cdrom")
7777
etree.SubElement(disk_seed, "driver", name="qemu", type="raw")
78+
per_vm_seed = VMS_DIR / str(vm_read.id) / "seed.iso"
7879
seed_iso_path = (
79-
str(VMS_DIR / str(vm_read.id) / "seed.iso")
80-
if vm_read.keyboard_layout
81-
else "/var/lib/distribox/images/seed.iso"
80+
str(per_vm_seed)
81+
if per_vm_seed.exists()
82+
else str(IMAGES_DIR / "seed.iso")
8283
)
8384
etree.SubElement(disk_seed, "source", file=seed_iso_path)
8485
etree.SubElement(disk_seed, "target", dev="hdb", bus="ide")

backend/app/services/vm_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def start(self):
192192
if not per_vm_seed.exists():
193193
ensure_seed_iso(
194194
keyboard_layout=self.keyboard_layout,
195-
vm_dir=vm_dir if self.keyboard_layout else None,
195+
vm_dir=vm_dir,
196196
)
197197
try:
198198
conn = QEMUConfig.get_connection()

backend/app/utils/seed.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,10 @@ def ensure_seed_iso(
128128
keyboard_layout: Optional[str] = None,
129129
vm_dir: Optional[Path] = None,
130130
) -> Path:
131-
if keyboard_layout and vm_dir:
131+
if vm_dir:
132132
seed_iso_path = vm_dir / "seed.iso"
133+
if seed_iso_path.exists() and not keyboard_layout:
134+
return seed_iso_path
133135
return _generate_seed_iso(seed_iso_path, keyboard_layout)
134136

135137
seed_iso_path = IMAGES_DIR / "seed.iso"

0 commit comments

Comments
 (0)