diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-06-23 08:45:22 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-06-23 08:45:25 +0000 |
| commit | c474118af3822acd9f15d965cb4d5cb42bd35023 (patch) | |
| tree | 16e4745d1050eee35c6cf26bf5c04820fcfcc083 /extensions/virtualbox-ssh.write | |
| parent | e584911f83ae311227994a1d19e9e81371c51b42 (diff) | |
| download | definitions-c474118af3822acd9f15d965cb4d5cb42bd35023.tar.gz | |
More fixes for various deployment extensions
Some of the extensions had extraneous imports, and a couple didn't
import things they used. The same bug as in the kvm deployment
extension existed in the virtualbox deployment extension, and is
fixed in this commit.
Change-Id: I2bd8169818ce5444af522c135a9e0326c1212ce2
Diffstat (limited to 'extensions/virtualbox-ssh.write')
| -rwxr-xr-x | extensions/virtualbox-ssh.write | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extensions/virtualbox-ssh.write b/extensions/virtualbox-ssh.write index 95643a4a..86b813cc 100755 --- a/extensions/virtualbox-ssh.write +++ b/extensions/virtualbox-ssh.write @@ -96,10 +96,14 @@ class VirtualBoxPlusSshWriteExtension(writeexts.WriteExtension): 'dummy-argv0', 'vbox', vdi_path, str(st.st_size), ] - subprocess.check_call( + xfer_hole_proc = subprocess.Popen( ['python', xfer_hole_path, raw_disk], + stdout=subprocess.PIPE) + recv_hole_proc = subprocess.Popen( ['ssh', ssh_host] + map(writeexts.shell_quote, ssh_remote_cmd), - stdout=None, stderr=None) + stdin=xfer_hole_proc.stdout) + xfer_hole_proc.stdout.close() + recv_hole_proc.communicate() def virtualbox_version(self, ssh_host): 'Get the version number of the VirtualBox running on the remote host.' |