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: allow empty domain for windows deployment

Browse Source
This commit is contained in:
Qiu Jian
2020-02-10 09:25:16 +08:00
parent 8701c6172e
commit 5834ec297e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestfs/fsdriver/windows.go
+3 -2
View File
@@ -226,7 +226,7 @@ func (w *SWindowsRootFs) DeployHosts(part IDiskPartition, hn, domain string, ips
hf.Parse(oldHf)
hf.Add("127.0.0.1", "localhost")
for _, ip := range ips {
hf.Add(ip, fmt.Sprintf("%s.%s", hn, domain), hn)
hf.Add(ip, getHostname(hn, domain), hn)
}
return w.rootFs.FilePutContents(ETC_HOSTS, hf.String(), false, true)
}
@@ -369,7 +369,7 @@ func (w *SWindowsRootFs) ChangeUserPasswd(part IDiskPartition, account, gid, pub
}
}
} else {
log.Errorf("Filaed Password %s", account)
log.Errorf("Failed Password %s", account)
}
defUanme := tool.GetDefaultAccount()
if len(defUanme) > 0 && defUanme != account {
@@ -439,6 +439,7 @@ func (w *SWindowsRootFs) deploySetupCompleteScripts(uname, passwd string) bool {
cmds = append(cmds, fmt.Sprintf(`REG ADD "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update" /v %s /t %s /d %s /f`,
v[0], v[1], v[2]))
}
cmds = append(cmds, `REG ADD "HKLM\SYSTEM\CurrentControlSet\Control\TimeZoneInformation" /v RealTimeIsUniversal /t REG_DWORD /d 1 /f`)
cmds = append(cmds, "Net start wuauserv")
cmds = append(cmds, "wuauclt /detectnow")
cmds = append(cmds, `del %SystemRoot%\chgpwd_setup.ps1`)