Merge branch 'fix-suse-shutdown-not-found' of github.com:philippfranke/vagrant into philippfranke-fix-suse-shutdown-not-found

Conflicts:
	CHANGELOG.md
This commit is contained in:
Mitchell Hashimoto 2014-04-01 21:50:32 -07:00
commit d2056863de
3 changed files with 22 additions and 0 deletions

View File

@ -15,6 +15,7 @@ BUG FIXES:
crash Vagrant. [GH-3364]
- commands/status: Machine readable output contains the target. [GH-3218]
- guests/debian: Changing host name works properly. [GH-3283]
- guests/suse: Shutdown works correctly on SLES [GH-2775]
- providers/virtualbox: Add missing translation for stopping status. [GH-3368]
- providers/virtualbox: Host-only networks set cableconnected property
to "yes" [GH-3365]

View File

@ -0,0 +1,16 @@
module VagrantPlugins
module GuestSuse
module Cap
class Halt
def self.halt(machine)
begin
machine.communicate.sudo("/sbin/shutdown -h now")
rescue IOError
# Do nothing, because it probably means the machine shut down
# and SSH connection was lost.
end
end
end
end
end
end

View File

@ -16,6 +16,11 @@ module VagrantPlugins
Cap::ChangeHostName
end
guest_capability("suse", "halt") do
require_relative "cap/halt"
Cap::Halt
end
guest_capability("suse", "configure_networks") do
require_relative "cap/configure_networks"
Cap::ConfigureNetworks