systemd: improve error handling for systemd-sysctl command

From a comment by @mvo5 on a code review.
mardy · Jun 1, 2022 · b7d12d3 · b7d12d3
1 parent ca83bdb
commit b7d12d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/systemd/sysctl.go b/systemd/sysctl.go
@@ -33,7 +33,10 @@ var (
 var systemdSysctlCmd = func(args ...string) error {
 	bs, err := exec.Command(systemdSysctlPath, args...).CombinedOutput()
 	if err != nil {
-		exitCode, _ := osutil.ExitCode(err)
+		exitCode, err := osutil.ExitCode(err)
+		if err != nil {
+			return err
+		}
 		return fmt.Errorf("%s invoked with %v failed with exit status %d: %s", systemdSysctlPath, args, exitCode, bs)
 	}
 	return nil

diff --git a/systemd/sysctl_test.go b/systemd/sysctl_test.go
@@ -68,6 +68,13 @@ exit 1
 	c.Assert(err, ErrorMatches, `(?m)systemd-sysctl invoked with \[--prefix net\] failed with exit status 1: foo`)
 }
 
+func (s *sysctlSuite) TestSysctlFailedExec(c *C) {
+	defer systemd.MockSystemdSysctlPath("/i/bet/this/does/not/exist/systemd-sysctl")()
+
+	err := systemd.Sysctl(nil)
+	c.Assert(err, ErrorMatches, `fork/exec /i/bet/this/does/not/exist/systemd-sysctl: no such file or directory`)
+}
+
 func (s *sysctlSuite) TestMockSystemdSysctl(c *C) {
 	var capturedArgs []string
 	var sysctlErr error