Protip, don't apply changes from old released versions to master
This commit is contained in:
parent
59852e79de
commit
e35fac0986
|
@ -80,7 +80,7 @@ module Vagrant
|
||||||
|
|
||||||
# Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option
|
# Solaris/OpenSolaris/Illumos uses SunSSH which doesn't support the IdentitiesOnly option
|
||||||
# (Also don't use it in plain mode, it'll skip user agents.)
|
# (Also don't use it in plain mode, it'll skip user agents.)
|
||||||
command_options += ["-o", "IdentitiesOnly=yes"] if !Util::Platform.solaris? || plain_mode
|
command_options += ["-o", "IdentitiesOnly=yes"] if !(Util::Platform.solaris? || plain_mode)
|
||||||
|
|
||||||
command_options += ["-i", options[:private_key_path]] if !plain_mode
|
command_options += ["-i", options[:private_key_path]] if !plain_mode
|
||||||
command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent]
|
command_options += ["-o", "ForwardAgent=yes"] if ssh_info[:forward_agent]
|
||||||
|
|
Loading…
Reference in New Issue