Merge pull request #5 from louisroyer/use-path

Use system commands from path instead of absolute name
shynuu · Nov 9, 2021 · 9d472a2 · 9d472a2
2 parents 286d760 + 2a83ad5
commit 9d472a2
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/runtime/trunks.go b/runtime/trunks.go
@@ -14,39 +14,42 @@ import (
 var Trunks *TrunksConfig
 
 func runIPtables(args ...string) error {
-	cmd := exec.Command("/sbin/iptables", args...)
+	cmd := exec.Command("iptables", args...)
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
 	cmd.Stdin = os.Stdin
 	err := cmd.Run()
 	if nil != err {
-		log.Println("Error running /sbin/iptables:", err)
+		errLog := fmt.Sprintf("Error running %s: %s", cmd.Args[0], err)
+		log.Println(errLog)
 		return err
 	}
 	return nil
 }
 
 func runTC(args ...string) error {
-	cmd := exec.Command("/sbin/tc", args...)
+	cmd := exec.Command("tc", args...)
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
 	cmd.Stdin = os.Stdin
 	err := cmd.Run()
 	if nil != err {
-		log.Println("Error running /sbin/tc:", err)
+		errLog := fmt.Sprintf("Error running %s: %s", cmd.Args[0], err)
+		log.Println(errLog)
 		return err
 	}
 	return nil
 }
 
 func runSYSCTL(args ...string) error {
-	cmd := exec.Command("/sbin/sysctl", args...)
+	cmd := exec.Command("sysctl", args...)
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
 	cmd.Stdin = os.Stdin
 	err := cmd.Run()
 	if nil != err {
-		log.Println("Error running /sbin/sysctl:", err)
+		errLog := fmt.Sprintf("Error running %s: %s", cmd.Args[0], err)
+		log.Println(errLog)
 		return err
 	}
 	return nil