From 627091de35f258fa3841e049fc4dd0390523aae7 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Fri, 24 Jun 2016 19:08:58 -0400
Subject: [PATCH] guests/linux: reorg

---
 plugins/guests/linux/cap/{mount_nfs.rb => nfs.rb} |  6 +++++-
 plugins/guests/linux/cap/nfs_client.rb            | 11 -----------
 plugins/guests/linux/plugin.rb                    |  8 ++++----
 3 files changed, 9 insertions(+), 16 deletions(-)
 rename plugins/guests/linux/cap/{mount_nfs.rb => nfs.rb} (92%)
 delete mode 100644 plugins/guests/linux/cap/nfs_client.rb

diff --git a/plugins/guests/linux/cap/mount_nfs.rb b/plugins/guests/linux/cap/nfs.rb
similarity index 92%
rename from plugins/guests/linux/cap/mount_nfs.rb
rename to plugins/guests/linux/cap/nfs.rb
index e220fd379..d47d53b98 100644
--- a/plugins/guests/linux/cap/mount_nfs.rb
+++ b/plugins/guests/linux/cap/nfs.rb
@@ -3,9 +3,13 @@ require "vagrant/util/retryable"
 module VagrantPlugins
   module GuestLinux
     module Cap
-      class MountNFS
+      class NFS
         extend Vagrant::Util::Retryable
 
+        def self.nfs_client_installed(machine)
+          machine.communicate.test("test -x /sbin/mount.nfs")
+        end
+
         def self.mount_nfs_folder(machine, ip, folders)
           comm = machine.communicate
 
diff --git a/plugins/guests/linux/cap/nfs_client.rb b/plugins/guests/linux/cap/nfs_client.rb
deleted file mode 100644
index 8e51da37c..000000000
--- a/plugins/guests/linux/cap/nfs_client.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module VagrantPlugins
-  module GuestLinux
-    module Cap
-      class NFSClient
-        def self.nfs_client_installed(machine)
-          machine.communicate.test("test -x /sbin/mount.nfs")
-        end
-      end
-    end
-  end
-end
diff --git a/plugins/guests/linux/plugin.rb b/plugins/guests/linux/plugin.rb
index 146915520..966f56353 100644
--- a/plugins/guests/linux/plugin.rb
+++ b/plugins/guests/linux/plugin.rb
@@ -32,8 +32,8 @@ module VagrantPlugins
       end
 
       guest_capability(:linux, :mount_nfs_folder) do
-        require_relative "cap/mount_nfs"
-        Cap::MountNFS
+        require_relative "cap/nfs"
+        Cap::NFS
       end
 
       guest_capability(:linux, :mount_smb_shared_folder) do
@@ -52,8 +52,8 @@ module VagrantPlugins
       end
 
       guest_capability(:linux, :nfs_client_installed) do
-        require_relative "cap/nfs_client"
-        Cap::NFSClient
+        require_relative "cap/nfs"
+        Cap::NFS
       end
 
       # For the Docker provider