Merge pull request #4270 from swordqiu/feature/qj-centos-8-support

feature: support centos 8 deployment. centos 8 requiest NetworkManager
This commit is contained in:
yunion-ci-robot
2019-12-22 23:29:13 +08:00
committed by GitHub
+5 -1
View File
@@ -934,7 +934,11 @@ func (r *sRedhatLikeRootFs) deployNetworkingScripts(rootFs IDiskPartition, nics
cmds.WriteString(nicDesc.Name)
cmds.WriteString("\n")
cmds.WriteString("ONBOOT=yes\n")
cmds.WriteString("NM_CONTROLLED=no\n")
if iv < 8 {
cmds.WriteString("NM_CONTROLLED=no\n")
} else {
cmds.WriteString("NM_CONTROLLED=yes\n")
}
cmds.WriteString("USERCTL=no\n")
if nicDesc.Mtu > 0 {
cmds.WriteString(fmt.Sprintf("MTU=%d\n", nicDesc.Mtu))