diff options
| -rw-r--r-- | lib/chef/provider/mount/mount.rb | 6 | ||||
| -rw-r--r-- | spec/unit/provider/mount/mount_spec.rb | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/chef/provider/mount/mount.rb b/lib/chef/provider/mount/mount.rb index abfffaa60e..2d4a5aadef 100644 --- a/lib/chef/provider/mount/mount.rb +++ b/lib/chef/provider/mount/mount.rb @@ -127,11 +127,7 @@ class Chef end def remount_command - if !(@new_resource.options.nil? || @new_resource.options.empty?) - return "mount -o remount,#{@new_resource.options.join(',')} #{@new_resource.mount_point}" - else - return "mount -o remount #{@new_resource.mount_point}" - end + return "mount -o remount,#{@new_resource.options.join(',')} #{@new_resource.mount_point}" end def remount_fs diff --git a/spec/unit/provider/mount/mount_spec.rb b/spec/unit/provider/mount/mount_spec.rb index ced22e4fbf..d6f71bc613 100644 --- a/spec/unit/provider/mount/mount_spec.rb +++ b/spec/unit/provider/mount/mount_spec.rb @@ -347,7 +347,7 @@ describe Chef::Provider::Mount::Mount do it "should use mount -o remount if remount is supported" do @new_resource.supports({:remount => true}) @current_resource.mounted(true) - @provider.should_receive(:shell_out!).with("mount -o remount #{@new_resource.mount_point}") + @provider.should_receive(:shell_out!).with("mount -o remount,defaults #{@new_resource.mount_point}") @provider.remount_fs end |