Merge pull request #2567 from thaJeztah/19.03_backport_no_error

tiborvass · web-flow · commit 026aabaa6598 · 2020-06-17T01:45:41.000-07:00
[19.03 backport] log error instead if disabling IPv6 router advertisement failed
diff --git a/drivers/bridge/setup_device.go b/drivers/bridge/setup_device.go
@@ -63,7 +63,7 @@ func setupDefaultSysctl(config *networkConfiguration, i *bridgeInterface) error
 		return nil
 	}
 	if err := ioutil.WriteFile(sysPath, []byte{'0', '\n'}, 0644); err != nil {
-		return fmt.Errorf("libnetwork: Unable to disable IPv6 router advertisement: %v", err)
+		logrus.WithError(err).Warn("unable to disable IPv6 router advertisement")
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func setupDefaultSysctl(config networkConfiguration, i bridgeInterface) error`
`63`	`63`	`return nil`
`64`	`64`	`}`
`65`	`65`	`if err := ioutil.WriteFile(sysPath, []byte{'0', '\n'}, 0644); err != nil {`
`66`		`- return fmt.Errorf("libnetwork: Unable to disable IPv6 router advertisement: %v", err)`
	`66`	`+ logrus.WithError(err).Warn("unable to disable IPv6 router advertisement")`
`67`	`67`	`}`
`68`	`68`	`return nil`
`69`	`69`	`}`