haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More reliable Ubuntu and Debian guest detection 

When dealing with lxc containers, '/proc/version' will have information
about the host machine kernel that can possibly have information about
an Ubuntu / Debian host, messing up with guest container detection.
This commit is contained in:
Fabio Rehm 2013-05-01 21:00:22 -03:00
parent 617bf08f9e
commit 4625d77072
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/guests/debian/guest.rb
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 /proc/version | grep 'Debian'") machine.communicate.test("cat /etc/issue | grep 'Debian'")
end end
end end
end end

2
plugins/guests/ubuntu/guest.rb
View File

@ -6,7 +6,7 @@ module VagrantPlugins
module GuestUbuntu module GuestUbuntu
class Guest < VagrantPlugins::GuestDebian::Guest class Guest < VagrantPlugins::GuestDebian::Guest
def detect?(machine) def detect?(machine)
machine.communicate.test("cat /proc/version | grep 'Ubuntu'") machine.communicate.test("cat /etc/issue | grep 'Ubuntu'")
end end
def mount_shared_folder(name, guestpath, options) def mount_shared_folder(name, guestpath, options)