mirror of
https://github.com/vagrant-libvirt/vagrant-libvirt.git
synced 2025-02-25 18:55:27 -06:00
Merge remote-tracking branch 'upstream/master' into allow_veryisolated_networks
This commit is contained in:
commit
6083b613d9
@ -45,7 +45,7 @@ module VagrantPlugins
|
||||
# :username => "mitchellh",
|
||||
# :private_key_path => "/path/to/my/key"
|
||||
#}
|
||||
env = @machine.action('read_ssh_info')
|
||||
env = @machine.action('read_ssh_info', :lock => false)
|
||||
env[:machine_ssh_info]
|
||||
end
|
||||
|
||||
@ -67,7 +67,7 @@ module VagrantPlugins
|
||||
# Run a custom action we define called "read_state" which does
|
||||
# what it says. It puts the state in the `:machine_state_id`
|
||||
# key in the environment.
|
||||
env = @machine.action('read_state')
|
||||
env = @machine.action('read_state', :lock => false)
|
||||
|
||||
state_id = env[:machine_state_id]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user