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

feat: pass kernel mask to get container volumes

Browse Source
This commit is contained in:
dump_stack() 2023-05-15 09:43:48 +00:00
parent a05b579086
commit 52c452debe
Signed by: dump_stack
GPG Key ID: BE44DA8C062D87DC
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distro/debian/debian.go
View File

@ -292,8 +292,8 @@ func ContainerKernels(d container.Image, kcfg *config.KernelConfig) (err error)
return return
} }
func ContainerVolumes(pkgname, contname string) (volumes container.Volumes) { func ContainerVolumes(km config.KernelMask, pkgname string) (volumes container.Volumes) {
pkgdir := filepath.Join("volumes", contname, pkgname) pkgdir := filepath.Join("volumes", km.DockerName(), pkgname)
volumes.LibModules = config.Dir(pkgdir, "/lib/modules") volumes.LibModules = config.Dir(pkgdir, "/lib/modules")
volumes.UsrSrc = config.Dir(pkgdir, "/usr/src") volumes.UsrSrc = config.Dir(pkgdir, "/usr/src")

2
kernel/kernel.go
View File

@ -334,7 +334,7 @@ func installKernel(sk config.KernelMask, pkgname string, force, headers bool) (e
if sk.DistroType == config.Debian { if sk.DistroType == config.Debian {
// Debian has different kernels (package version) by the // Debian has different kernels (package version) by the
// same name (ABI), so we need to separate /boot // same name (ABI), so we need to separate /boot
c.Volumes = debian.ContainerVolumes(sk.DockerName(), pkgname) c.Volumes = debian.ContainerVolumes(sk, pkgname)
searchdir = config.Dir("volumes", sk.DockerName()) searchdir = config.Dir("volumes", sk.DockerName())
} }