kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactored FindFiles

Browse Source 
Previous version relied on fspath.Math which didn't match
nested sub directories.

Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2023-10-16 16:27:31 +02:00
committed by Jonathon Anderson
parent 11b26e7e8c
commit bd54993e16
3 changed files with 63 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/pkg/kernel/kernel.go
View File

@@ -117,7 +117,11 @@ kernel version. A name for this kernel and were to find has also to be
supplied
*/
func Build(kernelVersion, kernelName, root string) error {
kernelDrivers := []string{path.Join("lib/modules/", kernelVersion, "*"), "lib/firmware/*"}
kernelDrivers := []string{path.Join("lib/modules/",
kernelVersion, "*"),
"lib/firmware/*",
"lib/modprobe.d",
"lib/modules-load.d"}
kernelDestination := KernelImage(kernelName)
driversDestination := KmodsImage(kernelName)
versionDestination := KernelVersionFile(kernelName)

4
internal/pkg/kernel/kernel_test.go
View File

@@ -45,7 +45,7 @@ func Test_BuildKernel(t *testing.T) {
for _, tt := range kernelBuildTests {
_, err = os.Create(path.Join(kernelDir, "boot", tt.kernelFileName))
assert.NoError(t, err)
err = os.MkdirAll(path.Join(kernelDir, "lib/modules", tt.kernelVersion), 0755)
err = os.MkdirAll(path.Join(kernelDir, "lib/modules", tt.kernelVersion, "/nested"), 0755)
assert.NoError(t, err)
_, err = os.Create(path.Join(kernelDir, "lib/modules", tt.kernelVersion, "test-module"))
assert.NoError(t, err)
@@ -63,7 +63,7 @@ func Test_BuildKernel(t *testing.T) {
assert.FileExists(t, path.Join(srvDir, "kernel", tt.kernelName, "kmods.img"))
files, err := util.CpioFiles(path.Join(srvDir, "kernel", tt.kernelName, "kmods.img"))
assert.NoError(t, err)
assert.Equal(t, files, []string{"lib/firmware/test-firmware", "lib/modules/1.2.3.4/symlink-module", "lib/modules/1.2.3.4/test-module"})
assert.ElementsMatch(t, files, []string{"lib/firmware/test-firmware", "lib/modules/1.2.3.4/symlink-module", "lib/modules/1.2.3.4/test-module", "lib/modules/1.2.3.4/nested"})
} else {
assert.Error(t, err)
}