Don’t attempt to copy built-in modules #47
Conversation
andrewshadura
force-pushed
the
skip-builtins
branch
2 times, most recently
from
5b7c256 to
e914031
Compare
|
this should close #13 and improve Ubuntu support. Thanks Andrej! |
|
To be honest, I think while my knowledge of Go is very basic, reading the file into a map seems a better choice for me than slurping it into a string, splitting it into an array and doing linear searches in it. |
andrewshadura
force-pushed
the
skip-builtins
branch
3 times, most recently
from
77ffb8a to
ccd122f
Compare
…he loop Also rename usrpath to moddir ie. "modules directory". Signed-off-by: Arnaud Rebillout <[email protected]>
(this is to prepare upcoming commits) Signed-off-by: Arnaud Rebillout <[email protected]>
This is needed for ArchLinux. With this commit, if we don't find a `.ko` modules, we re-try with `.ko.xz`, and if we don't find it, we definitely fail. Signed-off-by: Arnaud Rebillout <[email protected]>
Several distributions (including Ubuntu) ship some of the modules we rely on compiled into the kernel. Since these modules are listed in modules.builtin, it’s very easy to detect and skip them. This change fixes go-debos#13 and supersedes go-debos#36. Signed-off-by: Andrej Shadura <[email protected]>
andrewshadura
force-pushed
the
skip-builtins
branch
from
ccd122f to
db808ac
Compare
|
I have included xz support commits from #45 into my pull requests. |
|
agreed with the above, nice work ;-) |
| var builtinModules = make(map[string]bool) | ||
|
|
||
| f, err := os.Open(path.Join(moddir, kernelRelease, "modules.builtin")) | ||
| if err != nil { |
There was a problem hiding this comment.
hm, if the file does not exist, we should not attempt to load modules.builtin and just load the modules normally ?
what about systems that use modules.builtin.bin ?
There was a problem hiding this comment.
I was considering this, but then I realised we already unconditionally copy modules.builtin (unless I’m misreading the code), so it is already required to be present.
Several distributions (including Ubuntu) ship some of the modules we rely on compiled into the kernel. Since these modules are listed in
modules.builtin, it’s very easy to detect and skip them.Signed-off-by: Andrej Shadura [email protected]