Commit Graph

631 Commits

Author SHA1 Message Date
Matthew Hooker 2af19060ce Fix the way we run commands in chroot.
* Single quotes around chroot command cause it to fail.
* The chroot command also gets passed through the CommandWrapper template, so having sudo would clash with however the user wants to run it.
* Fix spelling mistake.
2013-10-01 09:35:55 +00:00
Mitchell Hashimoto a793e03fb6 builder/amazon/chroot: remove unused comment 2013-09-30 09:35:58 -07:00
Mitchell Hashimoto c84dd13539 builder/amazon/chroot: CommandWrapper
/cc @mwhooker - I changed the interface up a bit to return an error,
since things should return errors in Go (the ui.Error bit was kind of
ghetto because it had no way to bubble that error up except through the
UI).

Using this, I made it so that the communicator uses both a
CommandWrapper and ShellCommand with chroot so that the chroot commannd
is also wrapped (it wasn't before).

I think the functionality of all this is the same but I'd love if you
could look it over and make sure.
2013-09-30 09:33:57 -07:00
Mitchell Hashimoto 5b7c745c3c builder/amazon/chroot: alphebatize the configs
/cc @mwhooker
2013-09-30 09:32:20 -07:00
Matthew Hooker c92b73899c Merge remote-tracking branch 'origin/master' 2013-09-30 04:46:15 +00:00
Jack Pearkes 22a3cdb6bc builder/digitalocean: error message key is "message" not "error_message" 2013-09-29 11:01:30 +02:00
Matthew Hooker 6f7aad23f0 comment, formatting. 2013-09-29 08:04:57 +00:00
Matthew Hooker a84c74318c WIP copying files. 2013-09-28 01:10:33 +00:00
Matthew Hooker 837e641802 move wrapper definitions around. 2013-09-27 22:08:15 +00:00
Matthew Hooker 8857358830 building but there's an exec error. 2013-09-27 20:47:44 +00:00
Matthew Hooker 40e15c84ef fixing up types. 2013-09-27 11:55:19 +00:00
Matthew Hooker 299ee6efd2 replace command config with wrapper command. 2013-09-27 10:54:53 +00:00
Matthew Hooker 93c2de0af3 fix chroot Upload command. 2013-09-27 02:11:28 +00:00
Matthew Hooker ccd9b56f9c wip 2013-09-26 18:34:01 -07:00
Matthew Hooker 6d158eaa29 bugfixes, wip 2013-09-27 01:28:06 +00:00
Matthew Hooker 308b148bb4 get chroot command from proper place. 2013-09-26 16:39:37 -07:00
Matthew Hooker 6d4b834f61 Merge remote-tracking branch 'origin/master' into 430 2013-09-26 16:24:28 -07:00
Matthew Hooker 75d2d769a9 We're not using this log package. 2013-09-26 02:31:10 -07:00
Matthew Hooker 7e2b9de778 Unit tests. 2013-09-26 02:25:57 -07:00
Matthew Hooker 74adaa534e bugfix. 2013-09-26 01:35:29 -07:00
Matthew Hooker da467b7d67 using blocking cp method. 2013-09-26 01:32:53 -07:00
Matthew Hooker 0659ccdea0 Revert "notes/reorg."
This reverts commit 73c5aec24d.

Conflicts:
	builder/amazon/chroot/step_copy_files.go
2013-09-26 01:16:51 -07:00
Matthew Hooker 95f5cea285 wip 2013-09-26 01:08:06 -07:00
Matthew Hooker 03994f052d Merge branch 'master' into 430 2013-09-26 01:04:42 -07:00
Matthew Hooker a03807f8e8 wip 2013-09-26 00:58:25 -07:00
Matthew Hooker 73c5aec24d notes/reorg. 2013-09-26 00:31:07 -07:00
Matthew Hooker cd0cae207c pass chroot command to /bin/sh
this allows us to specify an arbitrary chroot command, i.e. for sudo
2013-09-25 03:20:22 -07:00
Bob Potter db84c9f547 Update builder-amazon-chroot to work with WaitForState changes in 7c56148f 2013-09-24 23:44:03 -05:00
Jason A. Beranek 9ed461cbd3 communicator/ssh, builder/digitalocean: fix new SSH API from upstream 2013-09-19 23:30:22 -05:00
Mitchell Hashimoto 30eccf4130 builder/virtualbox: support attaching guest additions [GH-405] 2013-09-18 18:15:46 -07:00
Mitchell Hashimoto f8ff737b0a builder/amazon/common: save access/secret key from env [GH-434] 2013-09-18 13:59:23 -07:00
Jesse Nelson 0fadb8d02f exclude everything in /tmp, but keep /tmp itself
There is IMO a bug with image builder that it removes /tmp, in the
current setup. This patch makes the image bundle ignore everyting in
/tmp, but keeps /tmp on the box.
2013-09-18 13:42:15 -07:00
Matthew Hooker bac3d8ffed Allow user to override chroot command. 2013-09-17 05:58:16 -07:00
Mitchell Hashimoto 11a68992ad builder/virtualbox: fix scan codes 2013-09-15 23:41:08 -07:00
Mitchell Hashimoto 61d9bb73a7 fmt 2013-09-15 23:29:29 -07:00
Charlie Sharpsteen 2bd13bbfe7 Fix scancode comment concerning key release
According to the scancode reference, the release key code is generated by
adding `0x80` to the key press code, not `0x81`.
2013-09-15 23:18:55 -07:00
Charlie Sharpsteen bb8e7f7814 Fix VirtualBox scancodes
Support for the backspace, delete and F1-F12 keys was added in commit 6028a3c.
However, that commit seems to have copied character codes from the vmware
builder into the VirtualBox builder. Character codes are appropriate for VMware
which communicates through a VNC. However, VirtualBox communicates through
simulating raw keyboard input and therefore needs scancodes which are key
press/key release sequences.

This patch converts backspace, delete and F1-F10 to scancodes. F11 and F12 are
not listed in the [scancode reference][scancodes] so they have been omitted.

[scancodes]: http://www.win.tue.nl/~aeb/linux/kbd/scancodes-1.html
2013-09-15 21:45:11 -07:00
Mitchell Hashimoto d6fca7975a communicator/ssh, builder/digitalocean: fix new SSH API from upstream 2013-09-15 12:21:21 -07:00
Mitchell Hashimoto 7c56148f95 builder/amazon/common: error if WaitForState can't find resource
repeatably
2013-09-12 20:37:14 -07:00
Mitchell Hashimoto f9feeac355 builder/amazon/common: rename instance.go to state.go, makes more sense 2013-09-12 20:33:58 -07:00
Mitchell Hashimoto 6a8e4f1439 builder/amazon/*: use WaitForState for AMIs 2013-09-12 20:33:32 -07:00
Mark Peek 9035b51165 builder/amazon: add clean_ami_name template function
Add a clean_ami_name template function which will translate illegal
characters in an AMI name to '-'. Example usage would be:
    "ami_name": "Ubuntu 12.04 {{isotime | clean_ami_name}}"
2013-09-07 18:42:50 -07:00
Sean Mackrory 27a2270593 Using the vm_name parameter to name OVA/OVF files and their attachments 2013-09-06 23:38:31 -07:00
Mitchell Hashimoto 8c30dc78ac builder/amazon/common: don't need squash here 2013-09-06 11:48:38 -07:00
Mitchell Hashimoto c4cf8553c8 builder/amazon/common: support NoDevice [GH-396] 2013-09-06 11:44:57 -07:00
Mitchell Hashimoto 67c71aa836 builder/amazon/common: if instance query returns none, ignore 2013-09-05 17:19:23 -07:00
Mitchell Hashimoto 5736dbd3aa Merge pull request #388 from jmassara/ami_region_copy
builder/amazon/all: AMI region copy fixes
2013-09-05 17:14:16 -07:00
Mitchell Hashimoto fb8b82fca5 builder/vmware: always set msg.AutoAnswer 2013-09-05 13:44:57 -07:00
Mitchell Hashimoto e26f7e87e0 builder/vmware: auto-answer dialogs [GH-393] 2013-09-05 13:43:01 -07:00
Mitchell Hashimoto 6746ffc133 builder/amazon/all: TemporaryKeyPairName
/cc @whostolebenfrog - I actually simplified things quite a bit. I added
a "uuid" global template function so it just uses that now. I renamed it
so that it is clear it is a temporary keypair.
2013-09-05 12:23:08 -07:00