Rename run_..._cmdline() functions to run_..._setup()

Better name since these functions end up doing more than just
constructing the command line to be used.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 7e59e0528c57c3557672885481c3552d474b7905..1252806333ebbfa5f1dd5145f20c3fac169d331f 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -7526,7 +7526,7 @@ def ensure_networkd(config: MkosiConfig) -> bool:
     return True
 
 
-def run_shell_cmdline(config: MkosiConfig, pipe: bool = False, commands: Optional[Sequence[str]] = None) -> List[str]:
+def run_shell_setup(config: MkosiConfig, pipe: bool = False, commands: Optional[Sequence[str]] = None) -> List[str]:
     if config.output_format in (OutputFormat.directory, OutputFormat.subvolume):
         target = f"--directory={config.output}"
     else:
@@ -7579,7 +7579,7 @@ def run_shell_cmdline(config: MkosiConfig, pipe: bool = False, commands: Optiona
 
 
 def run_shell(config: MkosiConfig) -> None:
-    run(run_shell_cmdline(config, pipe=not sys.stdout.isatty()), stdout=sys.stdout, stderr=sys.stderr)
+    run(run_shell_setup(config, pipe=not sys.stdout.isatty()), stdout=sys.stdout, stderr=sys.stderr)
 
 
 def find_qemu_binary(config: MkosiConfig) -> str:
@@ -7719,7 +7719,7 @@ def start_swtpm() -> Iterator[Optional[Path]]:
 
 
 @contextlib.contextmanager
-def run_qemu_cmdline(config: MkosiConfig) -> Iterator[List[str]]:
+def run_qemu_setup(config: MkosiConfig) -> Iterator[List[str]]:
     accel = "kvm" if config.qemu_kvm else "tcg"
 
     firmware, fw_supports_sb = find_qemu_firmware(config)
@@ -7829,7 +7829,7 @@ def run_qemu_cmdline(config: MkosiConfig) -> Iterator[List[str]]:
 
 
 def run_qemu(config: MkosiConfig) -> None:
-    with run_qemu_cmdline(config) as cmdline:
+    with run_qemu_setup(config) as cmdline:
         run(cmdline, stdout=sys.stdout, stderr=sys.stderr)
 
 
@@ -7889,7 +7889,7 @@ def run_systemd_cmdline(config: MkosiConfig, commands: Sequence[str]) -> List[st
     return ["systemd-run", "--quiet", "--wait", "--pipe", "-M", machine_name(config), "/usr/bin/env", *commands]
 
 
-def run_ssh_cmdline(config: MkosiConfig, commands: Optional[Sequence[str]] = None) -> List[str]:
+def run_ssh_setup(config: MkosiConfig, commands: Optional[Sequence[str]] = None) -> List[str]:
     cmd = [
             "ssh",
             # Silence known hosts file errors/warnings.
@@ -7923,7 +7923,7 @@ def run_ssh_cmdline(config: MkosiConfig, commands: Optional[Sequence[str]] = Non
 
 
 def run_ssh(config: MkosiConfig) -> CompletedProcess:
-    return run(run_ssh_cmdline(config), stdout=sys.stdout, stderr=sys.stderr)
+    return run(run_ssh_setup(config), stdout=sys.stdout, stderr=sys.stderr)
 
 
 def run_serve(config: MkosiConfig) -> None:

diff --git a/mkosi/machine.py b/mkosi/machine.py
index ef3c05b841619988cfbaf02b7c8d02227051b97c..e5feeb1d62ed71def50fe7ed687571934b8e0a40 100644 (file)
--- a/mkosi/machine.py
+++ b/mkosi/machine.py
@@ -27,9 +27,9 @@ from . import (
     parse_args,
     parse_boolean,
     prepend_to_environ_path,
-    run_qemu_cmdline,
-    run_shell_cmdline,
-    run_ssh_cmdline,
+    run_qemu_setup,
+    run_shell_setup,
+    run_ssh_setup,
     run_systemd_cmdline,
     unlink_output,
 )
@@ -134,10 +134,10 @@ class Machine:
             prepend_to_environ_path(self.config.extra_search_paths)
 
             if self.config.verb == Verb.boot:
-                cmdline = run_shell_cmdline(self.config)
+                cmdline = run_shell_setup(self.config)
             elif self.config.verb == Verb.qemu:
                 # We must keep the temporary file opened at run_qemu_cmdline accessible, hence the context stack.
-                cmdline = stack.enter_context(run_qemu_cmdline(self.config))
+                cmdline = stack.enter_context(run_qemu_setup(self.config))
             else:
                 die("No valid verb was entered.")
 
@@ -166,11 +166,11 @@ class Machine:
         stderr: Union[int, TextIO] = subprocess.PIPE if capture_output else sys.stderr
 
         if self.config.verb == Verb.qemu:
-            cmdline = run_ssh_cmdline(self.config, commands)
+            cmdline = run_ssh_setup(self.config, commands)
         elif self.config.verb == Verb.boot:
             cmdline = run_systemd_cmdline(self.config, commands)
         else:
-            cmdline = run_shell_cmdline(self.config, pipe=True, commands=commands)
+            cmdline = run_shell_setup(self.config, pipe=True, commands=commands)
 
         # The retry logic only applies when running commands against a VM.