]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Don't try to remove cache entries of custom distro default initrd
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 3 Jan 2025 20:10:25 +0000 (21:10 +0100)
committerJörg Behrmann <behrmann@physik.fu-berlin.de>
Fri, 3 Jan 2025 21:41:17 +0000 (22:41 +0100)
mkosi/__init__.py

index e09e7c1f44e06a1521ad5867560e28e32342ffe5..b0ff5d3697ccd44050dfddadd91ece1f8b7143fc 100644 (file)
@@ -4607,7 +4607,7 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
         for config in images:
             run_clean(args, config)
 
-        if args.force > 0:
+        if args.force > 0 and last.distribution != Distribution.custom:
             remove_cache_entries(finalize_default_initrd(last, tools=False, resources=resources))
 
         rmtree(Path(".mkosi-private"))
@@ -4688,10 +4688,11 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
         for config in images:
             run_clean(args, config)
 
-        initrd = finalize_default_initrd(last, tools=False, resources=resources)
+        if last.distribution != Distribution.custom:
+            initrd = finalize_default_initrd(last, tools=False, resources=resources)
 
-        if args.force > 1 or not have_cache(initrd):
-            remove_cache_entries(initrd)
+            if args.force > 1 or not have_cache(initrd):
+                remove_cache_entries(initrd)
 
     if tools and not (tools.output_dir_or_cwd() / tools.output).exists():
         check_tools(tools, Verb.build)