From 9b379eded8b70ee486d3bbb44c0c8a92fb3d07f7 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <root@dumpstack.io>
Date: Thu, 6 Jun 2024 13:02:27 +0000
Subject: [PATCH] feat!: rename option for using pre-built containers

---
 .github/workflows/e2e.yml |  2 +-
 cmd/kernel.go             | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index faf1c3f..e421b57 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -139,7 +139,7 @@ jobs:
         echo 'Type=oneshot' >> test.service
         echo 'WorkingDirectory=/root/test' >> test.service
         echo 'TimeoutStopSec=1' >> test.service
-        echo 'ExecStart=/usr/local/bin/out-of-tree kernel --no-container-cache autogen --threads=8 --max=64 --shuffle' >> test.service
+        echo 'ExecStart=/usr/local/bin/out-of-tree kernel --no-prebuilt-containers autogen --threads=8 --max=64 --shuffle' >> test.service
         echo 'ExecStart=/usr/local/bin/out-of-tree pew --qemu-timeout=10m --threads=4 --include-internal-errors' >> test.service
 
         scp test.service root@$IP:/etc/systemd/system/test.service
diff --git a/cmd/kernel.go b/cmd/kernel.go
index 5c06f96..89dbca1 100644
--- a/cmd/kernel.go
+++ b/cmd/kernel.go
@@ -27,18 +27,18 @@ import (
 )
 
 type KernelCmd struct {
-	NoDownload     bool `help:"do not download qemu image while kernel generation"`
-	UseHost        bool `help:"also use host kernels"`
-	Force          bool `help:"force reinstall kernel"`
-	NoHeaders      bool `help:"do not install kernel headers"`
-	Shuffle        bool `help:"randomize kernels installation order"`
-	Retries        int  `help:"amount of tries for each kernel" default:"2"`
-	Threads        int  `help:"threads for parallel installation" default:"1"`
-	Update         bool `help:"update container"`
-	ContainerCache bool `help:"try prebuilt container images first" default:"true" negatable:""`
-	Max            int  `help:"maximum kernels to download" default:"100500"`
-	NoPrune        bool `help:"do not remove dangling or unused images from local storage after build"`
-	NoCfgRegen     bool `help:"do not update kernels.toml"`
+	NoDownload         bool `help:"do not download qemu image while kernel generation"`
+	UseHost            bool `help:"also use host kernels"`
+	Force              bool `help:"force reinstall kernel"`
+	NoHeaders          bool `help:"do not install kernel headers"`
+	Shuffle            bool `help:"randomize kernels installation order"`
+	Retries            int  `help:"amount of tries for each kernel" default:"2"`
+	Threads            int  `help:"threads for parallel installation" default:"1"`
+	Update             bool `help:"update container"`
+	PrebuiltContainers bool `help:"try prebuilt container images first" default:"true" negatable:""`
+	Max                int  `help:"maximum kernels to download" default:"100500"`
+	NoPrune            bool `help:"do not remove dangling or unused images from local storage after build"`
+	NoCfgRegen         bool `help:"do not update kernels.toml"`
 
 	ContainerTimeout time.Duration `help:"container timeout"`
 
@@ -168,8 +168,8 @@ func (cmd *KernelCmd) GenKernel(km artifact.Target, pkg string) {
 	}
 }
 
-func (cmd *KernelCmd) fetchContainerCache(c container.Container) {
-	if !cmd.ContainerCache {
+func (cmd *KernelCmd) fetchPrebuiltContainer(c container.Container) {
+	if !cmd.PrebuiltContainers {
 		return
 	}
 	if c.Exist() && container.UseCache {
@@ -235,7 +235,7 @@ func (cmd *KernelCmd) Generate(g *Globals, km artifact.Target) (err error) {
 		return
 	}
 
-	cmd.fetchContainerCache(c)
+	cmd.fetchPrebuiltContainer(c)
 
 	pkgs, err := kernel.MatchPackages(km)
 	if err != nil || cmd.shutdown {
@@ -335,7 +335,7 @@ func (cmd *KernelListRemoteCmd) Run(kernelCmd *KernelCmd, g *Globals) (err error
 		return
 	}
 
-	kernelCmd.fetchContainerCache(c)
+	kernelCmd.fetchPrebuiltContainer(c)
 
 	pkgs, err := kernel.MatchPackages(km)
 	// error check skipped on purpose