aboutsummaryrefslogtreecommitdiffhomepage
path: root/cmd/earlyinit/modprobe.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/earlyinit/modprobe.go')
-rw-r--r--cmd/earlyinit/modprobe.go53
1 files changed, 29 insertions, 24 deletions
diff --git a/cmd/earlyinit/modprobe.go b/cmd/earlyinit/modprobe.go
index 8194c150..a7d1546f 100644
--- a/cmd/earlyinit/modprobe.go
+++ b/cmd/earlyinit/modprobe.go
@@ -15,10 +15,10 @@ import (
// ModprobeError describes an unsuccessful modprobe invocation.
type ModprobeError struct {
- ModAlias string `json:"modalias"`
- Stdout string `json:"stdout"`
- Stderr string `json:"stderr"`
- ExitCode int `json:"exit_code"`
+ Args []string `json:"args"`
+ Stdout string `json:"stdout"`
+ Stderr string `json:"stderr"`
+ ExitCode int `json:"exit_code"`
}
var _ report.RepresentableError = ModprobeError{}
@@ -32,6 +32,30 @@ func (e ModprobeError) Error() string {
)
}
+// modprobe invokes /system/sbin/modprobe and dispatches an error on failure.
+func modprobe(arg ...string) {
+ stdout, err := exec.Command("/system/sbin/modprobe", arg...).Output()
+ if err == nil {
+ if len(stdout) > 0 {
+ log.Println(string(stdout))
+ }
+ return
+ }
+
+ exitError, ok := errors.AsType[*exec.ExitError](err)
+ if !ok || exitError == nil {
+ r.Dispatch(report.Degraded, "invoke modprobe", err)
+ return
+ }
+
+ r.Dispatch(report.Trivial, "load device driver", ModprobeError{
+ Args: arg,
+ Stdout: string(stdout),
+ Stderr: string(exitError.Stderr),
+ ExitCode: exitError.ExitCode(),
+ })
+}
+
// dispatchModprobe invokes modprobe for [uevent.KOBJ_ADD] events raising new
// MODALIAS strings.
func dispatchModprobe(
@@ -50,25 +74,6 @@ func dispatchModprobe(
}()
for alias := range aliases {
- stdout, err := exec.Command("/system/sbin/modprobe", alias).Output()
- if err == nil {
- if len(stdout) > 0 {
- log.Println(string(stdout))
- }
- continue
- }
-
- exitError, ok := errors.AsType[*exec.ExitError](err)
- if !ok || exitError == nil {
- r.Dispatch(report.Degraded, "invoke modprobe", err)
- continue
- }
-
- r.Dispatch(report.Trivial, "load device driver", ModprobeError{
- ModAlias: alias,
- Stdout: string(stdout),
- Stderr: string(exitError.Stderr),
- ExitCode: exitError.ExitCode(),
- })
+ modprobe(alias)
}
}