summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2016-12-02 16:23:18 -0800
committerGitHub <noreply@github.com>2016-12-02 16:23:18 -0800
commit4755f863b11a2aa717cfc53999cc005804428fd0 (patch)
tree133e23530b20137aeb8e013381b160ddcc7dc82b
parent99adaa4499f24418cc07fca8d188947fc985e7a6 (diff)
parent2acb279140e1b0f21d2561911842b5696bbe042c (diff)
downloadchef-4755f863b11a2aa717cfc53999cc005804428fd0.tar.gz
Merge pull request #5603 from ttr/master
linux mount provider - skip device detection for zfs
-rw-r--r--lib/chef/provider/mount/mount.rb2
-rw-r--r--spec/unit/provider/mount/mount_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/provider/mount/mount.rb b/lib/chef/provider/mount/mount.rb
index 07da6ac361..49e825e39f 100644
--- a/lib/chef/provider/mount/mount.rb
+++ b/lib/chef/provider/mount/mount.rb
@@ -193,7 +193,7 @@ class Chef
def device_should_exist?
( @new_resource.device != "none" ) &&
( not network_device? ) &&
- ( not %w{ cgroup tmpfs fuse vboxsf }.include? @new_resource.fstype )
+ ( not %w{ cgroup tmpfs fuse vboxsf zfs }.include? @new_resource.fstype )
end
private
diff --git a/spec/unit/provider/mount/mount_spec.rb b/spec/unit/provider/mount/mount_spec.rb
index 0b956d9bb9..20a4fd88dd 100644
--- a/spec/unit/provider/mount/mount_spec.rb
+++ b/spec/unit/provider/mount/mount_spec.rb
@@ -107,7 +107,7 @@ describe Chef::Provider::Mount::Mount do
expect { @provider.load_current_resource(); @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
end
- %w{tmpfs fuse cgroup}.each do |fstype|
+ %w{tmpfs fuse cgroup vboxsf zfs}.each do |fstype|
it "does not expect the device to exist for #{fstype}" do
@new_resource.fstype(fstype)
@new_resource.device("whatever")