gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/test-driver: fix allow_reboot

Browse Source
This commit is contained in:
Astro
2023-03-15 02:24:25 +01:00
parent 5a1dc8acd9
commit 95d121e798
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/lib/test-driver/test_driver/machine.py
View File

@@ -144,7 +144,7 @@ class StartCommand:
self, self,
monitor_socket_path: Path, monitor_socket_path: Path,
shell_socket_path: Path, shell_socket_path: Path,
allow_reboot: bool = False, # TODO: unused, legacy? allow_reboot: bool = False,
) -> str: ) -> str:
display_opts = "" display_opts = ""
display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"]) display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"])
@@ -152,16 +152,14 @@ class StartCommand:
display_opts += " -nographic" display_opts += " -nographic"
# qemu options # qemu options
qemu_opts = "" qemu_opts = (
qemu_opts += (
""
if allow_reboot
else " -no-reboot"
" -device virtio-serial" " -device virtio-serial"
" -device virtconsole,chardev=shell" " -device virtconsole,chardev=shell"
" -device virtio-rng-pci" " -device virtio-rng-pci"
" -serial stdio" " -serial stdio"
) )
if not allow_reboot:
qemu_opts += " -no-reboot"
# TODO: qemu script already catpures this env variable, legacy? # TODO: qemu script already catpures this env variable, legacy?
qemu_opts += " " + os.environ.get("QEMU_OPTS", "") qemu_opts += " " + os.environ.get("QEMU_OPTS", "")
@@ -195,9 +193,10 @@ class StartCommand:
shared_dir: Path, shared_dir: Path,
monitor_socket_path: Path, monitor_socket_path: Path,
shell_socket_path: Path, shell_socket_path: Path,
allow_reboot: bool,
) -> subprocess.Popen: ) -> subprocess.Popen:
return subprocess.Popen( return subprocess.Popen(
self.cmd(monitor_socket_path, shell_socket_path), self.cmd(monitor_socket_path, shell_socket_path, allow_reboot),
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
@@ -898,6 +897,7 @@ class Machine:
self.shared_dir, self.shared_dir,
self.monitor_path, self.monitor_path,
self.shell_path, self.shell_path,
self.allow_reboot,
) )
self.monitor, _ = monitor_socket.accept() self.monitor, _ = monitor_socket.accept()
self.shell, _ = shell_socket.accept() self.shell, _ = shell_socket.accept()