diff options
| author | markgibbons <mark.gibbons@nordstrom.com> | 2014-08-11 21:14:15 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-08-21 12:48:11 -0700 |
| commit | 165ef10097b63c8e8c9e187bd44ac9f6cfd16e54 (patch) | |
| tree | afb72f0ef5f86465d498a7d55bf03149406bffd8 | |
| parent | d5669c5d3abca614cf63421dd2168aa604aa8877 (diff) | |
| download | chef-165ef10097b63c8e8c9e187bd44ac9f6cfd16e54.tar.gz | |
CHEF-1737: Minor clean up.
| -rw-r--r-- | lib/chef/provider/mount/solaris.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef/provider/mount/solaris.rb b/lib/chef/provider/mount/solaris.rb index 262b519de8..cf04150322 100644 --- a/lib/chef/provider/mount/solaris.rb +++ b/lib/chef/provider/mount/solaris.rb @@ -85,10 +85,10 @@ class Chef end def remount_fs + # FIXME: Should remount always do the remount or only if the options change? actual_options = options || [] actual_options.delete('noauto') mount_options = actual_options.empty? ? '' : ",#{actual_options.join(',')}" - # FIXME: Should remount always do the remount or only if the options change? shell_out!("mount -o remount#{mount_options} #{mount_point}") end @@ -121,14 +121,13 @@ class Chef def mount_options_unchanged? new_options = options_remove_noauto(options) current_options = options_remove_noauto(current_resource.nil? ? nil : current_resource.options) - auto = mount_at_boot? current_resource.fsck_device == fsck_device && current_resource.fstype == fstype && current_options == new_options && current_resource.dump == dump && current_resource.pass == pass && - current_resource.options.include?('noauto') == !auto + current_resource.options.include?('noauto') == !mount_at_boot? end def update_current_resource_state |