iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4269 from mitchellh/4268 

fix wait boot_command regex.
This commit is contained in:
Matthew Hooker 2016-12-08 16:51:30 -08:00 committed by GitHub
parent 82ab02d530 a46c071143
commit a27446b54f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builder/qemu/step_type_boot_command.go
View File

@ -144,6 +144,7 @@ func vncSendString(c *vnc.ClientConn, original string) {
special["<rightShift>"] = 0xFFE2
shiftedChars := "~!@#$%^&*()_+{}|:\"<>?"
waitRe := regexp.MustCompile(`^<wait([0-9hms]+)>`)
// TODO(mitchellh): Ripe for optimizations of some point, perhaps.
for len(original) > 0 {
@ -339,16 +340,13 @@ func vncSendString(c *vnc.ClientConn, original string) {
continue
}
if strings.HasPrefix(original, "<wait") && strings.HasSuffix(original, ">") {
re := regexp.MustCompile(`<wait([0-9hms]+)>$`)
dstr := re.FindStringSubmatch(original)
if len(dstr) > 1 {
log.Printf("Special code %s found, sleeping", dstr[0])
if dt, err := time.ParseDuration(dstr[1]); err == nil {
time.Sleep(dt)
original = original[len(dstr[0]):]
continue
}
waitMatch := waitRe.FindStringSubmatch(original)
if len(waitMatch) > 1 {
log.Printf("Special code %s found, sleeping", waitMatch[0])
if dt, err := time.ParseDuration(waitMatch[1]); err == nil {
time.Sleep(dt)
original = original[len(waitMatch[0]):]
continue
}
}