e0ec679838
This works by now calling the `:ssh` action on the provider. This action is allowed to do whatever it pleases, but should at some point probably call the `SSHExec` built-in middleware. The `SSHExec` built-in middleware was added. This uses the information returned by `Machine#ssh_info` and uses the `Vagrant::Util::SSH` helper to exec into the remote machine. The provider should do any work upfront in verifying that the machine is ready to be SSHed into.
37 lines
1.2 KiB
Ruby
37 lines
1.2 KiB
Ruby
module Vagrant
|
|
module Util
|
|
# This module provies a `safe_exec` method which is a drop-in
|
|
# replacement for `Kernel.exec` which addresses a specific issue
|
|
# which manifests on OS X 10.5 (GH-51) and perhaps other operating systems.
|
|
# This issue causes `exec` to fail if there is more than one system
|
|
# thread. In that case, `safe_exec` automatically falls back to
|
|
# forking.
|
|
class SafeExec
|
|
def self.exec(command, *args)
|
|
# Create a list of things to rescue from. Since this is OS
|
|
# specific, we need to do some defined? checks here to make
|
|
# sure they exist.
|
|
rescue_from = []
|
|
rescue_from << Errno::EOPNOTSUPP if defined?(Errno::EOPNOTSUPP)
|
|
rescue_from << Errno::E045 if defined?(Errno::E045)
|
|
rescue_from << SystemCallError
|
|
|
|
fork_instead = false
|
|
begin
|
|
pid = nil
|
|
pid = fork if fork_instead
|
|
Kernel.exec(command, *args) if pid.nil?
|
|
Process.wait(pid) if pid
|
|
rescue *rescue_from
|
|
# We retried already, raise the issue and be done
|
|
raise if fork_instead
|
|
|
|
# The error manifested itself, retry with a fork.
|
|
fork_instead = true
|
|
retry
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|