kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

fixed ip6tables command in error message

Browse source 
Signed-off-by: Benjamin Böhmke <benjamin@boehmke.net>
This commit is contained in:
Benjamin Böhmke 2020-12-11 11:10:55 +01:00
parent 3fe029f9c3
commit d14b7a5191
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/iptables/iptables.go
View file

@ -533,8 +533,10 @@ func (iptable IPTable) raw(args ...string) ([]byte, error) {
} }
path := iptablesPath path := iptablesPath
commandName := "iptables"
if iptable.Version == IPv6 { if iptable.Version == IPv6 {
path = ip6tablesPath path = ip6tablesPath
commandName = "ip6tables"
} }
logrus.Debugf("%s, %v", path, args) logrus.Debugf("%s, %v", path, args)
@ -542,7 +544,7 @@ func (iptable IPTable) raw(args ...string) ([]byte, error) {
startTime := time.Now() startTime := time.Now()
output, err := exec.Command(path, args...).CombinedOutput() output, err := exec.Command(path, args...).CombinedOutput()
if err != nil { if err != nil {
return nil, fmt.Errorf("iptables failed: iptables %v: %s (%s)", strings.Join(args, " "), output, err) return nil, fmt.Errorf("iptables failed: %s %v: %s (%s)", commandName, strings.Join(args, " "), output, err)
} }
return filterOutput(startTime, output, args...), err return filterOutput(startTime, output, args...), err