machine.go: Fix kernel modules open failed by checking builtin modules #36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
this seems to work fine on ubuntu 18.04 / neon user edition |
elboulangero
reviewed
Aug 7, 2019
sjoerdsimons
requested changes
Dec 5, 2019
| if mergedUsrSystem() { | ||
| usrpath = "/usr/lib/modules" | ||
| } | ||
| data, err := ioutil.ReadFile(path.Join(usrpath, kernelRelease, "modules.builtin")) |
There was a problem hiding this comment.
On debian systems modules.builtin doesn't exist at least on the 4.19 kernels it does however exist on the 5.3 packaging. So the code should handle that properly (e.g. assume nothing is builtin like its' done now)
There was a problem hiding this comment.
In any case, we’re unconditionally copying modules.builtin below, so the case when it doesn’t exist has already not been covered.
This was referenced Dec 11, 2019
Closed
This allows to use debos on Ubuntu (at least) Signed-off-by: Frédéric Danis <[email protected]>
andrewshadura
added a commit
to andrewshadura/fakemachine
that referenced
this pull request
Feb 28, 2020
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
added a commit
to andrewshadura/fakemachine
that referenced
this pull request
Feb 28, 2020
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]>
sjoerdsimons
pushed a commit
that referenced
this pull request
May 27, 2020
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 #13 and supersedes #36. Signed-off-by: Andrej Shadura <[email protected]>
|
Reworked and merged in #47, hence closing :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows to use debos on Ubuntu (at least)
Signed-off-by: Frédéric Danis [email protected]