unistack-org/cloudinit
4
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

networkd: Fix bug causing bonding to always be loaded

Browse Source
This commit is contained in:
Alex Crawford 2014-08-16 10:44:29 -07:00
parent a923161f4a
commit c39dd5cc67
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/networkd.go
View File

@ -74,15 +74,14 @@ func maybeProbe8012q(interfaces []network.InterfaceGenerator) error {
} }
func maybeProbeBonding(interfaces []network.InterfaceGenerator) error { func maybeProbeBonding(interfaces []network.InterfaceGenerator) error {
args := []string{"bonding"}
for _, iface := range interfaces { for _, iface := range interfaces {
if iface.Type() == "bond" { if iface.Type() == "bond" {
args = append(args, strings.Split(iface.ModprobeParams(), " ")...) args := append([]string{"bonding"}, strings.Split(iface.ModprobeParams(), " ")...)
break log.Printf("Probing LKM %q (%q)\n", "bonding", args)
return exec.Command("modprobe", args...).Run()
} }
} }
log.Printf("Probing LKM %q (%q)\n", "bonding", args) return nil
return exec.Command("modprobe", args...).Run()
} }
func restartNetworkd() error { func restartNetworkd() error {