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

Merge pull request #6436 from zexi/hotfix/baremetal-deploy-disable-cloud-init

Browse Source 
baremetal: fix ssh put empty content file not created
This commit is contained in:
Zexi Li
2020-05-19 10:15:59 +08:00
committed by GitHub
parent 38c956bd10 541c72849a
commit 09381fdd73
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestfs/sshpart/sshpart.go
+18 -13
View File
@@ -309,20 +309,25 @@ func (p *SSHPartition) sshFilePutContents(sPath, content string, modAppend bool)
}
cmds := []string{}
var chunkSize int = 8192
for offset := 0; offset < len(content); offset += chunkSize {
end := offset + chunkSize
if end > len(content) {
end = len(content)
}
ll, err := stringutils.EscapeEchoString(content[offset:end])
if err != nil {
return fmt.Errorf("EscapeEchoString %q error: %v", content[offset:end], err)
}
cmd := fmt.Sprintf(`echo -n -e "%s" %s %s`, ll, op, sPath)
if len(content) == 0 {
cmd := fmt.Sprintf(`echo -n -e "" %s %s`, op, sPath)
cmds = append(cmds, cmd)
if op == ">" {
op = ">>"
} else {
var chunkSize int = 8192
for offset := 0; offset < len(content); offset += chunkSize {
end := offset + chunkSize
if end > len(content) {
end = len(content)
}
ll, err := stringutils.EscapeEchoString(content[offset:end])
if err != nil {
return fmt.Errorf("EscapeEchoString %q error: %v", content[offset:end], err)
}
cmd := fmt.Sprintf(`echo -n -e "%s" %s %s`, ll, op, sPath)
cmds = append(cmds, cmd)
if op == ">" {
op = ">>"
}
}
}
_, err := p.term.Run(cmds...)