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

Merge pull request #6367 from knixeur/fix-host-slackware 

Fix Slackware Host detection and nfsd checks
This commit is contained in:
Mitchell Hashimoto 2015-11-18 14:02:06 -08:00
parent d680811d01 07e38f1bb3
commit fe36131549
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/hosts/slackware/cap/nfs.rb
View File

@ -3,7 +3,7 @@ module VagrantPlugins
module Cap module Cap
class NFS class NFS
def self.nfs_check_command(env) def self.nfs_check_command(env)
"pidof nfsd >/dev/null" "/sbin/pidof nfsd >/dev/null"
end end
def self.nfs_start_command(env) def self.nfs_start_command(env)

2
plugins/hosts/slackware/host.rb
View File

@ -4,7 +4,7 @@ module VagrantPlugins
module HostSlackware module HostSlackware
class Host < Vagrant.plugin("2", :host) class Host < Vagrant.plugin("2", :host)
def detect?(env) def detect?(env)
return File.exists?("/etc/slackware-release") || return File.exists?("/etc/slackware-version") ||
!Dir.glob("/usr/lib/setup/Plamo-*").empty? !Dir.glob("/usr/lib/setup/Plamo-*").empty?
end end
end end