From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 10 Feb 2023 09:40:03 +0000 (+0100)
Subject: Set timezone credential to current timezone by default
X-Git-Tag: v15~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=684dd1d48a8f74130cdc7836bc54e6b92af4903a;p=thirdparty%2Fmkosi.git

Set timezone credential to current timezone by default

We don't configure a default timezone in the images, so let's set
a timezone credential by default to the current timezone to avoid
a prompt during first boot.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index bb12edbc7..017203616 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2467,6 +2467,14 @@ def normalize_script(path: Optional[Path]) -> Optional[Path]:
     return Path(path).absolute()
 
 
+def default_credentials() -> dict[str, str]:
+    tz = run(["timedatectl", "show", "-p", "Timezone", "--value"], text=True, stdout=subprocess.PIPE).stdout.strip()
+
+    return {
+        "firstboot.timezone": tz,
+    }
+
+
 def load_args(args: argparse.Namespace) -> MkosiConfig:
     ARG_DEBUG.update(args.debug)
 
@@ -2617,13 +2625,13 @@ def load_args(args: argparse.Namespace) -> MkosiConfig:
         args.environment = {}
 
     if args.credentials:
-        credentials = {}
+        credentials = default_credentials()
         for s in args.credentials:
             key, _, value = s.partition("=")
             credentials[key] = value
         args.credentials = credentials
     else:
-        args.credentials = {}
+        args.credentials = default_credentials()
 
     if args.cache_path is not None:
         args.cache_path = args.cache_path.absolute()