summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Dibowitz <phil@ipom.com>2015-07-08 08:57:41 -0700
committerPhil Dibowitz <phil@ipom.com>2015-07-08 08:57:41 -0700
commit002daec07ceb3bd44fb64daddd9b5d2aa3c0fc0a (patch)
tree778111419b97c4f4eff02d50e5f3621a8a6adaf0
parent6235650eee77a7e32052a9778d7eccf8aaed3d0d (diff)
parent7c4747e13b25a3a62dca94b261d750fa5d91f233 (diff)
downloadohai-002daec07ceb3bd44fb64daddd9b5d2aa3c0fc0a.tar.gz
Merge pull request #573 from jaymzh/fs2_bugfix
filesystem2 bugfix
-rw-r--r--lib/ohai/plugins/linux/filesystem2.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/plugins/linux/filesystem2.rb b/lib/ohai/plugins/linux/filesystem2.rb
index 8fe2aa3c..c1a0d054 100644
--- a/lib/ohai/plugins/linux/filesystem2.rb
+++ b/lib/ohai/plugins/linux/filesystem2.rb
@@ -64,8 +64,8 @@ Ohai.plugin(:Filesystem2) do
next if ['device', 'mount'].include?(key)
view[entry[:device]][key] = val
end
+ view[entry[:device]][:mounts] ||= []
if entry[:mount]
- view[entry[:device]][:mounts] = [] unless view[entry[:device]][:mounts]
view[entry[:device]][:mounts] << entry[:mount]
end
end
@@ -81,8 +81,8 @@ Ohai.plugin(:Filesystem2) do
next if ['mount', 'device'].include?(key)
view[entry[:mount]][key] = val
end
+ view[entry[:mount]][:devices] ||= []
if entry[:device]
- view[entry[:mount]][:devices] = [] unless view[entry[:mount]][:devices]
view[entry[:mount]][:devices] << entry[:device]
end
end