summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Belchamber <james@belchamber.com>2014-08-12 09:08:30 +0100
committerLamont Granquist <lamont@scriptkiddie.org>2015-08-18 12:13:23 -0700
commit2696a360c09856e1dc0fab754d3b00143b147853 (patch)
tree6894b9078801557facedbba72c7a55604d7bcc4e
parent1d0ff22eb1c7ee1a17191ddd28cd3a99aef83271 (diff)
downloadchef-2696a360c09856e1dc0fab754d3b00143b147853.tar.gz
now just using action_remount!
-rw-r--r--lib/chef/provider/mount.rb17
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/chef/provider/mount.rb b/lib/chef/provider/mount.rb
index 557a54bbe3..6bdfd5b867 100644
--- a/lib/chef/provider/mount.rb
+++ b/lib/chef/provider/mount.rb
@@ -46,22 +46,7 @@ class Chef
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
+ action_remount
end
else
converge_by("mount #{current_resource.device} to #{current_resource.mount_point}") do