tools/out-of-tree
1
0
Fork 0
Code Releases Activity

Add force reinstall flag

Browse Source
This commit is contained in:
dump_stack() 2023-03-22 18:20:45 +00:00
parent b98dc87d54
commit 2c7341f0d8
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel.go
View File

@ -27,6 +27,7 @@ import (
type KernelCmd struct { type KernelCmd struct {
NoDownload bool `help:"do not download qemu image while kernel generation"` NoDownload bool `help:"do not download qemu image while kernel generation"`
UseHost bool `help:"also use host kernels"` UseHost bool `help:"also use host kernels"`
Force bool `help:"force reinstall kernel"`
List KernelListCmd `cmd:"" help:"list kernels"` List KernelListCmd `cmd:"" help:"list kernels"`
Autogen KernelAutogenCmd `cmd:"" help:"generate kernels based on the current config"` Autogen KernelAutogenCmd `cmd:"" help:"generate kernels based on the current config"`
@ -68,7 +69,7 @@ func (cmd KernelAutogenCmd) Run(kernelCmd *KernelCmd, g *Globals) (err error) {
return return
} }
err = generateKernels(sk, g.Config.Docker.Registry, g.Config.Docker.Commands, cmd.Max, !kernelCmd.NoDownload) err = generateKernels(sk, g.Config.Docker.Registry, g.Config.Docker.Commands, cmd.Max, !kernelCmd.NoDownload, kernelCmd.Force)
if err != nil { if err != nil {
return return
} }
@ -98,6 +99,7 @@ func (cmd *KernelGenallCmd) Run(kernelCmd *KernelCmd, g *Globals) (err error) {
g.Config.Docker.Commands, g.Config.Docker.Commands,
math.MaxUint32, math.MaxUint32,
!kernelCmd.NoDownload, !kernelCmd.NoDownload,
kernelCmd.Force,
) )
if err != nil { if err != nil {
return return
@ -333,7 +335,7 @@ func generateBaseDockerImage(registry string, commands []config.DockerCommand,
return return
} }
func installKernel(sk config.KernelMask, pkgname string) (err error) { func installKernel(sk config.KernelMask, pkgname string, force bool) (err error) {
slog := log.With(). slog := log.With().
Str("distro_type", sk.DistroType.String()). Str("distro_type", sk.DistroType.String()).
Str("distro_release", sk.DistroRelease). Str("distro_release", sk.DistroRelease).
@ -352,11 +354,14 @@ func installKernel(sk config.KernelMask, pkgname string) (err error) {
for _, krel := range moddirs { for _, krel := range moddirs {
if strings.Contains(pkgname, krel.Name()) { if strings.Contains(pkgname, krel.Name()) {
// already installed kernel if force {
slog.Info().Msg("Reinstall")
} else {
slog.Debug().Msg("Already installed") slog.Debug().Msg("Already installed")
return return
} }
} }
}
slog.Debug().Msgf("Installing kernel") slog.Debug().Msgf("Installing kernel")
@ -608,7 +613,7 @@ func shuffle(a []string) []string {
func generateKernels(km config.KernelMask, registry string, func generateKernels(km config.KernelMask, registry string,
commands []config.DockerCommand, max int64, commands []config.DockerCommand, max int64,
download bool) (err error) { download, force bool) (err error) {
log.Info().Msgf("Generating for kernel mask %v", km) log.Info().Msgf("Generating for kernel mask %v", km)
@ -646,7 +651,7 @@ func generateKernels(km config.KernelMask, registry string,
log.Info().Msgf("%d/%d %s", i+1, len(pkgs), pkg) log.Info().Msgf("%d/%d %s", i+1, len(pkgs), pkg)
err = installKernel(km, pkg) err = installKernel(km, pkg, force)
if err == nil { if err == nil {
max-- max--
} else { } else {