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:
commit
d2056863de
|
@ -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]
|
||||
|
|
|
@ -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
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue