Merge pull request #5369 from gpkfr/support_debian_jessie

Fix #5368 Added specific support for Debian 8 (aka jessie) to permit proper vagrant halt execution...
This commit is contained in:
Mitchell Hashimoto 2015-02-24 09:23:31 -08:00
commit 7e238e06be
4 changed files with 47 additions and 1 deletions

View File

@ -2,7 +2,7 @@ module VagrantPlugins
module GuestDebian module GuestDebian
class Guest < Vagrant.plugin("2", :guest) class Guest < Vagrant.plugin("2", :guest)
def detect?(machine) def detect?(machine)
machine.communicate.test("cat /etc/issue | grep 'Debian'") machine.communicate.test("cat /etc/issue | grep 'Debian' | grep -v '8'")
end end
end end
end end

View File

@ -0,0 +1,16 @@
module VagrantPlugins
module GuestDebian8
module Cap
class Halt
def self.halt(machine)
begin
machine.communicate.sudo("shutdown -h -H")
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

@ -0,0 +1,9 @@
module VagrantPlugins
module GuestDebian8
class Guest < Vagrant.plugin("2", :guest)
def detect?(machine)
machine.communicate.test("cat /etc/issue | grep 'Debian' | grep '8'")
end
end
end
end

View File

@ -0,0 +1,21 @@
require "vagrant"
module VagrantPlugins
module GuestDebian8
class Plugin < Vagrant.plugin("2")
name "Debian Jessie guest"
description "Debian Jessie guest support."
guest("debian8", "debian") do
require File.expand_path("../guest", __FILE__)
Guest
end
guest_capability("debian8", "halt") do
require_relative "cap/halt"
Cap::Halt
end
end
end
end