Merge pull request #4172 from mvo5/dont-fail-connection-on-module-load

 interfaces/kmod: simplify loadModules now that errors are ignored

Author: mvo5

interfaces/kmod/backend.go

@@ -88,7 +88,7 @@ func (b *Backend) Setup(snapInfo *snap.Info, confinement interfaces.ConfinementO
 	}
 
 	if len(changed) > 0 {
-		return loadModules(modules)
+		loadModules(modules)
 	}
 	return nil
 }

interfaces/kmod/kmod.go

@@ -20,28 +20,17 @@
 package kmod
 
 import (
-	"fmt"
 	"os/exec"
-
-	"github.com/snapcore/snapd/osutil"
 )
 
-func LoadModule(module string) error {
-	if output, err := exec.Command("modprobe", "--syslog", module).CombinedOutput(); err != nil {
-		return fmt.Errorf("cannot load module %s: %s", module, osutil.OutputErr(output, err))
-	}
-	return nil
-}
-
 // loadModules loads given list of modules via modprobe.
 // Since different kernels may not have the requested module, we treat any
 // error from modprobe as non-fatal and subsequent module loads are attempted
 // (otherwise failure to load a module means failure to connect the interface
 // and the other security backends)
-func loadModules(modules []string) error {
+func loadModules(modules []string) {
 	for _, mod := range modules {
-		LoadModule(mod) // ignore errors which are logged by
-		// LoadModule() via syslog
+		// ignore errors which are logged by loadModule() via syslog
+		_ = exec.Command("modprobe", "--syslog", mod).Run()
 	}
-	return nil
 }

interfaces/kmod/kmod_test.go

@@ -45,11 +45,10 @@ func (s *kmodSuite) TestModprobeCall(c *C) {
 	cmd := testutil.MockCommand(c, "modprobe", "")
 	defer cmd.Restore()
 
-	err := kmod.LoadModules([]string{
+	kmod.LoadModules([]string{
 		"module1",
 		"module2",
 	})
-	c.Assert(err, IsNil)
 	c.Assert(cmd.Calls(), DeepEquals, [][]string{
 		{"modprobe", "--syslog", "module1"},
 		{"modprobe", "--syslog", "module2"},