Merge pull request #1761 from mysteriumnetwork/add-ipset-dep

Fix ipset tool for RPi
mysteriumnetwork · Feb 24, 2020 · 72d5b04 · 72d5b04
2 parents 4b20b17 + c73888f
commit 72d5b04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/bin/package/sudoers/mysterium-node b/bin/package/sudoers/mysterium-node
@@ -3,6 +3,7 @@
 mysterium-node    ALL=NOPASSWD: /sbin/sysctl
 mysterium-node    ALL=NOPASSWD: /sbin/iptables
 mysterium-node    ALL=NOPASSWD: /usr/sbin/ipset
+mysterium-node    ALL=NOPASSWD: /sbin/ipset
 mysterium-node    ALL=NOPASSWD: /sbin/ip
 mysterium-node    ALL=NOPASSWD: /etc/mysterium-node/prepare-env.sh
 mysterium-node    ALL=NOPASSWD: /sbin/tc

diff --git a/debian/control b/debian/control
@@ -22,6 +22,7 @@ Depends:
  resolvconf,
  openvpn (>= 2.4.0),
  ca-certificates,
+ ipset,
  iptables,
  iproute2,
  wireguard,

diff --git a/firewall/ipset/ipset.go b/firewall/ipset/ipset.go
@@ -29,7 +29,7 @@ import (
 var Exec = defaultExec
 
 func defaultExec(args []string) ([]string, error) {
-	args = append([]string{"sudo", "/usr/sbin/ipset"}, args...)
+	args = append([]string{"sudo", "ipset"}, args...)
 	output, err := cmdutil.ExecOutput(args...)
 	if err != nil {
 		return nil, errors.Wrap(err, "ipset cmd error")