mount now remounts if options change

1 files changed, 31 insertions, 1 deletions

diff --git a/lib/chef/provider/mount.rb b/lib/chef/provider/mount.rb
index 2039e9ae51..e45d13843a 100644
--- a/lib/chef/provider/mount.rb
+++ b/lib/chef/provider/mount.rb
@@ -42,7 +42,7 @@ class Chef
       end
 
       def action_mount
-        unless current_resource.mounted
+        unless current_resource.mounted && mount_options_unchanged?
           converge_by("mount #{current_resource.device} to #{current_resource.mount_point}") do
             mount_fs
             Chef::Log.info("#{new_resource} mounted")
@@ -52,6 +52,36 @@ class Chef
         end
       end
 
+      def action_mount
+        if current_resource.mounted
+          if mount_options_unchanged?
+            Chef::Log.debug("#{new_resource} is already mounted")
+          else
+            if new_resource.supports[:remount]
+              converge_by("remount #{current_resource.device}") do
+                remount_fs
+                Chef::Log.info("#{new_resource} remounted")
+              end
+            else
+              converge_by("unmount #{current_resource.device}") do
+                umount_fs
+                Chef::Log.info("#{new_resource} unmounted")
+              end
+              wait_until_unmounted(unmount_retries)
+              converge_by("mount #{current_resource.device}") do
+                mount_fs
+                Chef::Log.info("#{new_resource} mounted")
+              end
+            end
+          end
+        else
+          converge_by("mount #{current_resource.device} to #{current_resource.mount_point}") do
+            mount_fs
+            Chef::Log.info("#{new_resource} mounted")
+          end
+        end
+      end
+
       def action_umount
         if current_resource.mounted
           converge_by("unmount #{current_resource.device}") do