exec: avoid clobbering timeout

Signed-off-by: eriknordmark <[email protected]>
lf-edge · Oct 25, 2023 · b25d016 · b25d016
1 parent a1dc2fa
commit b25d016
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/pillar/base/execwrapper.go b/pkg/pillar/base/execwrapper.go
@@ -48,7 +48,9 @@ func (c *Command) Output() ([]byte, error) {
 	var buf bytes.Buffer
 	c.command.Stdout = &buf
 	c.buffer = &buf
-	c.timeout = defaultTimeout
+	if c.timeout == 0 {
+		c.timeout = defaultTimeout
+	}
 	return c.execCommand()
 }
 
@@ -59,7 +61,9 @@ func (c *Command) CombinedOutput() ([]byte, error) {
 	c.command.Stdout = &buf
 	c.command.Stderr = &buf
 	c.buffer = &buf
-	c.timeout = defaultTimeout
+	if c.timeout == 0 {
+		c.timeout = defaultTimeout
+	}
 	return c.execCommand()
 }