From 11e681a9e0eed37ad0f2a2a5cf89a0a5d57673ad Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sat, 13 May 2023 12:44:17 +0300 Subject: feat: derive default cache tarball name from Debian release This allows us to more easily switch between Debian releases with the cache mucking things up. Sponsored-by: author --- v-i | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'v-i') diff --git a/v-i b/v-i index 18141ff..761323b 100755 --- a/v-i +++ b/v-i @@ -379,6 +379,10 @@ def vmdb_spec(system, ansible_vars): return {"steps": steps} +def cache_name(spec): + return f"{spec.debian_release}.cache.tar.gz" + + class SystemSpec: def __init__(self, filename): REQUIRED = "required" @@ -445,7 +449,7 @@ def main(): p.add_argument("--verbose", action="store_true") p.add_argument("--very-verbose", action="store_true") p.add_argument("--log", default="install.log") - p.add_argument("--cache", default="cache.tar.gz") + p.add_argument("--cache", default=None) p.add_argument("spec") args = p.parse_args() @@ -463,6 +467,9 @@ def main(): system = SystemSpec(args.spec) log(f"spec: {system!r}") + cache = args.cache or cache_name(system) + log(f"cache: {cache}") + ansible_vars = dict(system.ansible_vars) ansible_vars["hostname"] = system.hostname for filename in system.ansible_vars_files: @@ -490,7 +497,7 @@ def main(): argv = [ "vmdb2", - f"--rootfs-tarball={args.cache}", + f"--rootfs-tarball={cache}", f"--log={args.log}", f"--image={system.drive}", specfile, -- cgit v1.2.1