Please review pull request #196: Support dmidecode on DragonFly BSD. opened by (jaydg)
Description:
As requested a pull request for feature #14334.
- Opened: Sun May 06 20:33:45 UTC 2012
- Based on: puppetlabs:master (1bd98fd94b5e577216b80789ee9f933dd5cc74f8)
- Requested merge: jaydg:dfly-dmidecode (1810f23608c81943eb7d85ac7126032da7d41911)
Diff follows:
diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb
index 7542eae..ecaa97f 100644
--- a/lib/facter/util/manufacturer.rb
+++ b/lib/facter/util/manufacturer.rb
@@ -13,7 +13,7 @@ def self.get_dmi_table()
return nil unless FileTest.exists?("/usr/local/sbin/dmidecode")
output=%x{/usr/local/sbin/dmidecode 2>/dev/null}
- when 'NetBSD'
+ when 'NetBSD', 'DragonFly'
return nil unless FileTest.exists?("/usr/pkg/sbin/dmidecode")
output=%x{/usr/pkg/sbin/dmidecode 2>/dev/null}
@@ -38,7 +38,7 @@ def self.dmi_find_system_info(name)
if line =~ /#{key}/ and line =~ /\n\s+#{value} (.+)\n/
result = $1.strip
Facter.add(facterkey) do
- confine :kernel => [ :linux, :freebsd, :netbsd, :sunos, :"gnu/kfreebsd" ]
+ confine :kernel => [ :linux, :freebsd, :netbsd, :sunos, :"gnu/kfreebsd", :dragonfly ]
setcode do
result
end
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
