From 604d21e4a28e9d6c1985fcd229168f38ce5c47d6 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Wed, 5 Apr 2023 12:31:46 +0000
Subject: [PATCH] Refactor deb package matcher

---
 kernel.go | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/kernel.go b/kernel.go
index 78b01e4..e25bdef 100644
--- a/kernel.go
+++ b/kernel.go
@@ -161,10 +161,9 @@ func (cmd *KernelConfigRegenCmd) Run(kernelCmd *KernelCmd, g *Globals) (err erro
 	return updateKernelsCfg(kernelCmd.UseHost, !kernelCmd.NoDownload)
 }
 
-func matchDebianHeadersPkg(container, mask string, generic bool) (
-	pkgs []string, err error) {
+func matchDebImagePkg(container, mask string) (pkgs []string, err error) {
 
-	cmd := "apt-cache search linux-image | cut -d ' ' -f 1"
+	cmd := "apt-cache search --names-only '^linux-image-[0-9\\.\\-]*-generic' | awk '{ print $1 }'"
 
 	// FIXME timeout should be in global out-of-tree config
 	c, err := NewContainer(container, time.Hour)
@@ -183,18 +182,8 @@ func matchDebianHeadersPkg(container, mask string, generic bool) (
 	}
 
 	kernels := r.FindAll([]byte(output), -1)
-
 	for _, k := range kernels {
 		pkg := string(k)
-		if generic && !strings.HasSuffix(pkg, "generic") {
-			continue
-		}
-		if pkg == "linux-headers-generic" {
-			continue
-		}
-		if pkg == "linux-image-generic" {
-			continue
-		}
 		pkgs = append(pkgs, pkg)
 	}
 
@@ -703,8 +692,7 @@ func generateKernels(km config.KernelMask, registry string,
 	var pkgs []string
 	switch km.DistroType {
 	case config.Ubuntu:
-		pkgs, err = matchDebianHeadersPkg(km.DockerName(),
-			km.ReleaseMask, true)
+		pkgs, err = matchDebImagePkg(km.DockerName(), km.ReleaseMask)
 	case config.CentOS:
 		pkgs, err = matchCentOSDevelPkg(km.DockerName(),
 			km.ReleaseMask, true)