summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2018-03-22 11:07:22 +0000
committerThom May <thom@chef.io>2018-03-22 11:07:22 +0000
commit689f4cb742beedbee5d0bce643f82ffc214aef25 (patch)
tree37294e042ff879d0861a68c55493ec28d91e43e3
parent65d26d53a70a7813c36e29f819868aadacd612f9 (diff)
downloadchef-689f4cb742beedbee5d0bce643f82ffc214aef25.tar.gz
Ensure that we pass the correct options to mounttm/fix_mount_options
On solaris, default is not a thing Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--lib/chef/provider/mount/solaris.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/mount/solaris.rb b/lib/chef/provider/mount/solaris.rb
index f59a2d2c6a..fc2c9483ce 100644
--- a/lib/chef/provider/mount/solaris.rb
+++ b/lib/chef/provider/mount/solaris.rb
@@ -74,8 +74,8 @@ class Chef
end
def mount_fs
- actual_options = options || []
- actual_options.delete("noauto")
+ actual_options = native_options(options)
+ actual_options.delete("-")
command = "mount -F #{fstype}"
command << " -o #{actual_options.join(',')}" unless actual_options.empty?
command << " #{device} #{mount_point}"
@@ -88,8 +88,8 @@ class Chef
def remount_fs
# FIXME: Should remount always do the remount or only if the options change?
- actual_options = options || []
- actual_options.delete("noauto")
+ actual_options = native_options(options)
+ actual_options.delete("-")
mount_options = actual_options.empty? ? "" : ",#{actual_options.join(',')}"
shell_out!("mount -o remount#{mount_options} #{mount_point}")
end