Get rid of check_root() function

Only has one call site so let's just inline it.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 028d90395a76c93336faf621beca22a654878459..2bd8a4950c3f343ed5c06303c83a2a9e63e7b134 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1736,11 +1736,6 @@ def acl_toggle_build(config: MkosiConfig, uid: int) -> Iterator[None]:
         yield
 
 
-def check_root() -> None:
-    if os.getuid() != 0:
-        die("Must be invoked as root.")
-
-
 @contextlib.contextmanager
 def acl_toggle_boot(config: MkosiConfig, uid: int) -> Iterator[None]:
     if not config.acl or config.output_format != OutputFormat.directory:
@@ -1927,8 +1922,8 @@ def prepend_to_environ_path(config: MkosiConfig) -> Iterator[None]:
 
 
 def run_verb(args: MkosiArgs, presets: Sequence[MkosiConfig]) -> None:
-    if args.verb.needs_sudo():
-        check_root()
+    if args.verb.needs_root() and os.getuid() != 0:
+        die(f"Must be root to run the {args.verb} command")
 
     if args.verb == Verb.genkey:
         return generate_key_cert_pair(args)

diff --git a/mkosi/config.py b/mkosi/config.py
index 9ebcd38d9059bc89f945417acee7d5a739758c19..5c1b440100f3707d2adb61d83e7d9d54774c2b70 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -64,7 +64,7 @@ class Verb(StrEnum):
     def needs_build(self) -> bool:
         return self in (Verb.build, Verb.shell, Verb.boot, Verb.qemu, Verb.serve)
 
-    def needs_sudo(self) -> bool:
+    def needs_root(self) -> bool:
         return self in (Verb.shell, Verb.boot)