diff --git a/builder/xenserver/common/common_config.go b/builder/xenserver/common/common_config.go index 6907e18..c375613 100644 --- a/builder/xenserver/common/common_config.go +++ b/builder/xenserver/common/common_config.go @@ -9,10 +9,13 @@ import ( "github.com/hashicorp/packer-plugin-sdk/common" "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" xenapi "github.com/terra-farm/go-xen-api-client" ) type CommonConfig struct { + bootcommand.VNCConfig `mapstructure:",squash"` + Username string `mapstructure:"remote_username"` Password string `mapstructure:"remote_password"` HostIp string `mapstructure:"remote_host"` @@ -28,7 +31,6 @@ type CommonConfig struct { HostPortMin uint `mapstructure:"host_port_min"` HostPortMax uint `mapstructure:"host_port_max"` - BootCommand []string `mapstructure:"boot_command"` ShutdownCommand string `mapstructure:"shutdown_command"` RawBootWait string `mapstructure:"boot_wait"` diff --git a/builder/xenserver/common/config.go b/builder/xenserver/common/config.go index 53e76b7..59ae802 100644 --- a/builder/xenserver/common/config.go +++ b/builder/xenserver/common/config.go @@ -32,6 +32,8 @@ type Config struct { RawInstallTimeout string `mapstructure:"install_timeout"` InstallTimeout time.Duration `` SourcePath string `mapstructure:"source_path"` + + Firmware string `mapstructure:"firmware"` Firmware string `mapstructure:"firmware"` diff --git a/builder/xenserver/common/step_type_boot_command.go b/builder/xenserver/common/step_type_boot_command.go index 00689ac..96ab373 100644 --- a/builder/xenserver/common/step_type_boot_command.go +++ b/builder/xenserver/common/step_type_boot_command.go @@ -10,13 +10,11 @@ import ( "log" "net" "strings" - "time" - "unicode" - "unicode/utf8" "github.com/hashicorp/packer-plugin-sdk/multistep" "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer-plugin-sdk/template/interpolate" + "github.com/hashicorp/packer-plugin-sdk/bootcommand" "github.com/mitchellh/go-vnc" ) @@ -105,18 +103,38 @@ func (self *StepTypeBootCommand) Run(ctx context.Context, state multistep.StateB return multistep.ActionHalt } - buffer := make([]byte, 10000) - _, err = tlsConn.Read(buffer) - if err != nil && err != io.EOF { - err := fmt.Errorf("failed to read vnc session response: %v", err) - state.Put("error", err) - ui.Error(err.Error()) - return multistep.ActionHalt + // Look for \r\n\r\n sequence. Everything after the HTTP Header is for the vnc client. + + builder := strings.Builder{} + buffer := make([]byte, 1) + sequenceProgress := 0 + + for { + if _, err := io.ReadFull(tlsConn, buffer); err != nil { + err := fmt.Errorf("failed to start vnc session: %v", err) + state.Put("error", err) + ui.Error(err.Error()) + return multistep.ActionHalt + } + + builder.WriteByte(buffer[0]) + + if buffer[0] == '\n' && sequenceProgress % 2 == 1 { + sequenceProgress++ + } else if buffer[0] == '\r' && sequenceProgress % 2 == 0 { + sequenceProgress++ + } else { + sequenceProgress = 0 + } + + if sequenceProgress == 4 { + break + } } + + ui.Say(fmt.Sprintf("Received response: %s", builder.String())) - ui.Say(fmt.Sprintf("Received response: %s", string(buffer))) - - vncClient, err := vnc.Client(tlsConn, &vnc.ClientConfig{Exclusive: true}) + vncClient, err := vnc.Client(tlsConn, &vnc.ClientConfig{Exclusive: false}) if err != nil { err := fmt.Errorf("Error establishing VNC session: %s", err) @@ -126,6 +144,7 @@ func (self *StepTypeBootCommand) Run(ctx context.Context, state multistep.StateB } defer vncClient.Close() + log.Printf("Connected to the VNC console: %s", vncClient.DesktopName) @@ -148,24 +167,35 @@ func (self *StepTypeBootCommand) Run(ctx context.Context, state multistep.StateB uint(httpPort), } + vncDriver := bootcommand.NewVNCDriver(vncClient, config.VNCConfig.BootKeyInterval) + ui.Say("Typing boot commands over VNC...") - for _, command := range config.BootCommand { - - command, err := interpolate.Render(command, &self.Ctx) - if err != nil { - err := fmt.Errorf("Error preparing boot command: %s", err) - state.Put("error", err) - ui.Error(err.Error()) - return multistep.ActionHalt - } - - // Check for interrupts - if _, ok := state.GetOk(multistep.StateCancelled); ok { - return multistep.ActionHalt - } - - vncSendString(vncClient, command) + + command, err := interpolate.Render(config.VNCConfig.FlatBootCommand(), &self.Ctx) + + if err != nil { + err := fmt.Errorf("Error preparing boot command: %s", err) + state.Put("error", err) + ui.Error(err.Error()) + return multistep.ActionHalt } + + seq, err := bootcommand.GenerateExpressionSequence(command) + + if err != nil { + err := fmt.Errorf("Error generating boot command: %s", err) + state.Put("error", err) + ui.Error(err.Error()) + return multistep.ActionHalt + } + + if err := seq.Do(ctx, vncDriver); err != nil { + err := fmt.Errorf("Error running boot command: %s", err) + state.Put("error", err) + ui.Error(err.Error()) + return multistep.ActionHalt + } + ui.Say("Finished typing.") @@ -173,100 +203,3 @@ func (self *StepTypeBootCommand) Run(ctx context.Context, state multistep.StateB } func (self *StepTypeBootCommand) Cleanup(multistep.StateBag) {} - -// Taken from qemu's builder plugin - not an exported function. -func vncSendString(c *vnc.ClientConn, original string) { - // Scancodes reference: https://github.com/qemu/qemu/blob/master/ui/vnc_keysym.h - special := make(map[string]uint32) - special[""] = 0xFF08 - special[""] = 0xFFFF - special[""] = 0xFF0D - special[""] = 0xFF1B - special[""] = 0xFFBE - special[""] = 0xFFBF - special[""] = 0xFFC0 - special[""] = 0xFFC1 - special[""] = 0xFFC2 - special[""] = 0xFFC3 - special[""] = 0xFFC4 - special[""] = 0xFFC5 - special[""] = 0xFFC6 - special[""] = 0xFFC7 - special[""] = 0xFFC8 - special[""] = 0xFFC9 - special[""] = 0xFF0D - special[""] = 0xFF09 - special[""] = 0xFF52 - special[""] = 0xFF54 - special[""] = 0xFF51 - special[""] = 0xFF53 - special[""] = 0x020 - special[""] = 0xFF63 - special[""] = 0xFF50 - special[""] = 0xFF57 - special[""] = 0xFF55 - special[""] = 0xFF56 - - shiftedChars := "~!@#$%^&*()_+{}|:\"<>?" - - // TODO(mitchellh): Ripe for optimizations of some point, perhaps. - for len(original) > 0 { - var keyCode uint32 - keyShift := false - - if strings.HasPrefix(original, "") { - log.Printf("Special code '' found, sleeping one second") - time.Sleep(1 * time.Second) - original = original[len(""):] - continue - } - - if strings.HasPrefix(original, "") { - log.Printf("Special code '' found, sleeping 5 seconds") - time.Sleep(5 * time.Second) - original = original[len(""):] - continue - } - - if strings.HasPrefix(original, "") { - log.Printf("Special code '' found, sleeping 10 seconds") - time.Sleep(10 * time.Second) - original = original[len(""):] - continue - } - - for specialCode, specialValue := range special { - if strings.HasPrefix(original, specialCode) { - log.Printf("Special code '%s' found, replacing with: %d", specialCode, specialValue) - keyCode = specialValue - original = original[len(specialCode):] - break - } - } - - if keyCode == 0 { - r, size := utf8.DecodeRuneInString(original) - original = original[size:] - keyCode = uint32(r) - keyShift = unicode.IsUpper(r) || strings.ContainsRune(shiftedChars, r) - - log.Printf("Sending char '%c', code %d, shift %v", r, keyCode, keyShift) - } - - if keyShift { - c.KeyEvent(uint32(KeyLeftShift), true) - } - - c.KeyEvent(keyCode, true) - time.Sleep(time.Second / 10) - c.KeyEvent(keyCode, false) - time.Sleep(time.Second / 10) - - if keyShift { - c.KeyEvent(uint32(KeyLeftShift), false) - } - - // no matter what, wait a small period - time.Sleep(50 * time.Millisecond) - } -} diff --git a/builder/xenserver/iso/builder.go b/builder/xenserver/iso/builder.go index a9e37f1..0f3497e 100644 --- a/builder/xenserver/iso/builder.go +++ b/builder/xenserver/iso/builder.go @@ -76,6 +76,10 @@ func (self *Builder) Prepare(raws ...interface{}) (params []string, warns []stri if self.config.CloneTemplate == "" { self.config.CloneTemplate = "Other install media" } + + if self.config.Firmware == "" { + self.config.Firmware = "bios" + } if self.config.Firmware == "" { self.config.Firmware = "bios" diff --git a/go.sum b/go.sum index 7bf8a65..a939b34 100644 --- a/go.sum +++ b/go.sum @@ -588,6 +588,7 @@ golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPI golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mobile v0.0.0-20191130191448-5c0e7e404af8/go.mod h1:p895TfNkDgPEmEQrNiOtIl3j98d/tGU95djDj7NfyjQ= +golang.org/x/mobile v0.0.0-20201208152944-da85bec010a2 h1:3HADozU50HyrJ2jklLtr3xr0itFkz9u4LxCJhqKVdjI= golang.org/x/mobile v0.0.0-20201208152944-da85bec010a2/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=