From: Pyfisch <pyfisch@posteo.org>
Date: Thu, 15 Sep 2022 15:03:49 +0000 (+0200)
Subject: Run mkosi serve without root
X-Git-Tag: v14~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b56399b619dbf6fae6d4fc202c93324cf537c339;p=thirdparty%2Fmkosi.git

Run mkosi serve without root

If the output image already exists mkosi serve works without root.
Otherwise an error message is shown (as before).

Show the correct URL where the artifacts are served.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 4f8bd3606..333a3ea53 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -124,7 +124,7 @@ SomeIO = Union[BinaryIO, TextIO]
 PathString = Union[Path, str]
 
 MKOSI_COMMANDS_NEED_BUILD = (Verb.shell, Verb.boot, Verb.qemu, Verb.serve)
-MKOSI_COMMANDS_SUDO = (Verb.build, Verb.clean, Verb.shell, Verb.boot, Verb.serve)
+MKOSI_COMMANDS_SUDO = (Verb.build, Verb.clean, Verb.shell, Verb.boot)
 MKOSI_COMMANDS_CMDLINE = (Verb.build, Verb.shell, Verb.boot, Verb.qemu, Verb.ssh)
 
 DRACUT_SYSTEMD_EXTRAS = [
@@ -7902,13 +7902,12 @@ def run_serve(config: MkosiConfig) -> None:
     """Serve the output directory via a tiny embedded HTTP server"""
 
     port = 8081
-    image = config.output.parent
 
     if config.output_dir is not None:
         os.chdir(config.output_dir)
 
     with http.server.HTTPServer(("", port), http.server.SimpleHTTPRequestHandler) as httpd:
-        print(f"Serving HTTP on port {port}: http://localhost:{port}/{image}")
+        print(f"Serving HTTP on port {port}: http://localhost:{port}/")
         httpd.serve_forever()