From 56faf1a3516805734b2732b5a0e4c09943edc887 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Tue, 20 Jun 2023 16:01:38 +0000 Subject: [PATCH] fix: remove type from kernel release --- distro/opensuse/opensuse.go | 12 +++++++++++- kernel.go | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/distro/opensuse/opensuse.go b/distro/opensuse/opensuse.go index 101eaed..9c808cf 100644 --- a/distro/opensuse/opensuse.go +++ b/distro/opensuse/opensuse.go @@ -96,7 +96,17 @@ func (suse OpenSUSE) Kernels() (kernels []distro.KernelInfo, err error) { return } - return c.Kernels() + kernels, err = c.Kernels() + if err != nil { + return + } + + for i := range kernels { + kernels[i].KernelRelease = strings.Replace( + kernels[i].KernelRelease, "-default", "", -1) + } + + return } func (suse OpenSUSE) envs() (envs []string) { diff --git a/kernel.go b/kernel.go index 13a14d7..2c17fca 100644 --- a/kernel.go +++ b/kernel.go @@ -107,6 +107,8 @@ func (cmd *KernelCmd) GenKernel(km config.Target, pkg string) { var found bool if kinfo.Distro.ID == distro.Debian { // FIXME found = pkg == kinfo.Package + } else if kinfo.Distro.ID == distro.OpenSUSE { + found = strings.Contains(pkg, kinfo.KernelRelease) } else { found = strings.Contains(pkg, kinfo.KernelVersion) }