From 690551348103190eab0bf2cc02a6733096bff2b0 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Fri, 26 Oct 2012 14:15:58 -0400 Subject: [PATCH] Fix match? and nfs? for Arch host --- plugins/hosts/arch/host.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/hosts/arch/host.rb b/plugins/hosts/arch/host.rb index fe56f31f1..cb96cce89 100644 --- a/plugins/hosts/arch/host.rb +++ b/plugins/hosts/arch/host.rb @@ -6,7 +6,16 @@ module VagrantPlugins module HostArch class Host < VagrantPlugins::HostLinux::Host def self.match? - File.exist?("/etc/rc.conf") && File.exist?("/etc/pacman.conf") + File.exist?("/etc/arch-release") + end + + def self.nfs? + # HostLinux checks for nfsd which returns false unless the + # services are actively started. This leads to a misleading + # error message. Checking for nfs (no d) seems to work + # regardless. Also fixes useless use of cat, regex, and + # redirection. + Kernel.system("grep -Fq nfs /proc/filesystems") end # Normal, mid-range precedence.