summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2018-03-21 10:09:45 +0000
committerGitHub <noreply@github.com>2018-03-21 10:09:45 +0000
commite20833b3bb49147e9c33e7cf16c1fa07344e43da (patch)
tree5ae429b5675178ff50a505af91b10798a218f453
parentc94d5f060be63ea0e1a77fb301aba66a2b78fdec (diff)
parentb8dd88937c0aae5f157e4a26da70c23fc47c830c (diff)
downloadchef-e20833b3bb49147e9c33e7cf16c1fa07344e43da.tar.gz
Merge pull request #7017 from chef/tm/mount_nils
[chef-13] support nils because of course
-rw-r--r--lib/chef/resource/mount.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb
index 9d8a4089cf..2b1a93becb 100644
--- a/lib/chef/resource/mount.rb
+++ b/lib/chef/resource/mount.rb
@@ -42,15 +42,15 @@ class Chef
default: :device,
equal_to: RUBY_PLATFORM =~ /solaris/i ? %i{ device } : %i{ device label uuid }
- property :fsck_device, String, default: "-"
+ property :fsck_device, [String, nil], default: "-"
property :fstype, [String, nil], default: "auto"
property :options, [Array, String, nil],
coerce: proc { |arg| arg.kind_of?(String) ? arg.split(",") : arg },
default: %w{defaults}
- property :dump, [Integer, FalseClass], default: 0
- property :pass, [Integer, FalseClass], default: 2
+ property :dump, [Integer, FalseClass, nil], default: 0
+ property :pass, [Integer, FalseClass, nil], default: 2
property :mounted, [TrueClass, FalseClass], default: false
property :enabled, [TrueClass, FalseClass], default: false
property :username, String