opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: support empty dns domain

Browse Source
This commit is contained in:
Qiu Jian
2020-02-06 03:28:26 +08:00
parent 74c272cfae
commit 8536166426
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestfs/fsdriver/linux.go
+16 -4
View File
@@ -65,6 +65,14 @@ func (l *sLinuxRootFs) RootSignatures() []string {
return []string{"/bin", "/etc", "/boot", "/lib", "/usr"}
}
func getHostname(hostname, domain string) string {
if len(domain) > 0 {
return fmt.Sprintf("%s.%s", hostname, domain)
} else {
return hostname
}
}
func (l *sLinuxRootFs) DeployHosts(rootFs IDiskPartition, hostname, domain string, ips []string) error {
var etcHosts = "/etc/hosts"
var oldHostFile string
@@ -79,7 +87,7 @@ func (l *sLinuxRootFs) DeployHosts(rootFs IDiskPartition, hostname, domain strin
hf.Parse(oldHostFile)
hf.Add("127.0.0.1", "localhost")
for _, ip := range ips {
hf.Add(ip, fmt.Sprintf("%s.%s", hostname, domain), hostname)
hf.Add(ip, getHostname(hostname, domain), hostname)
}
return rootFs.FilePutContents(etcHosts, hf.String(), false, false)
}
@@ -591,7 +599,9 @@ func (d *sDebianLikeRootFs) DeployNetworkingScripts(rootFs IDiskPartition, nics
dnslist := netutils2.GetNicDns(nicDesc)
if len(dnslist) > 0 {
cmds.WriteString(fmt.Sprintf(" dns-nameservers %s\n", strings.Join(dnslist, " ")))
cmds.WriteString(fmt.Sprintf(" dns-search %s\n", nicDesc.Domain))
if len(nicDesc.Domain) > 0 {
cmds.WriteString(fmt.Sprintf(" dns-search %s\n", nicDesc.Domain))
}
}
if len(nicDesc.TeamingSlaves) > 0 {
cmds.WriteString(getNicTeamingConfigCmds(nicDesc.TeamingSlaves))
@@ -840,7 +850,7 @@ func (r *sRedhatLikeRootFs) DeployHostname(rootFs IDiskPartition, hn, domain str
var sPath = "/etc/sysconfig/network"
centosHn := ""
centosHn += "NETWORKING=yes\n"
centosHn += fmt.Sprintf("HOSTNAME=%s.%s\n", hn, domain)
centosHn += fmt.Sprintf("HOSTNAME=%s\n", getHostname(hn, domain))
if err := rootFs.FilePutContents(sPath, centosHn, false, false); err != nil {
return err
}
@@ -1009,7 +1019,9 @@ func (r *sRedhatLikeRootFs) deployNetworkingScripts(rootFs IDiskPartition, nics
for i := 0; i < len(dnslist); i++ {
cmds.WriteString(fmt.Sprintf("DNS%d=%s\n", i+1, dnslist[i]))
}
cmds.WriteString(fmt.Sprintf("DOMAIN=%s\n", nicDesc.Domain))
if len(nicDesc.Domain) > 0 {
cmds.WriteString(fmt.Sprintf("DOMAIN=%s\n", nicDesc.Domain))
}
}
} else {
cmds.WriteString("BOOTPROTO=dhcp\n")