Signed-off-by: Michael Kincaid <[email protected]>
---
Local-branch: ticket/next/4869
lib/facter/manufacturer.rb | 5 +++++
lib/facter/util/manufacturer.rb | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lib/facter/manufacturer.rb b/lib/facter/manufacturer.rb
index 26aef5f..98ed29e 100644
--- a/lib/facter/manufacturer.rb
+++ b/lib/facter/manufacturer.rb
@@ -26,6 +26,11 @@ if Facter.value(:kernel) == "OpenBSD"
}
Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
+elsif Facter.value(:kernel) == "Darwin"
+ mfg_keys = {
+ 'hw.model' => 'productname'
+ }
+ Facter::Manufacturer.sysctl_find_system_info(mfg_keys)
elsif Facter.value(:kernel) == "SunOS" and Facter.value(:hardwareisa) ==
"sparc"
Facter::Manufacturer.prtdiag_sparc_find_system_info()
elsif Facter.value(:kernel) == "windows"
diff --git a/lib/facter/util/manufacturer.rb b/lib/facter/util/manufacturer.rb
index 8e9bde2..3811980 100644
--- a/lib/facter/util/manufacturer.rb
+++ b/lib/facter/util/manufacturer.rb
@@ -53,7 +53,7 @@ module Facter::Manufacturer
def self.sysctl_find_system_info(name)
name.each do |sysctlkey,facterkey|
Facter.add(facterkey) do
- confine :kernel => :openbsd
+ confine :kernel => [:openbsd, :darwin]
setcode do
Facter::Util::Resolution.exec("sysctl -n " + sysctlkey)
end
--
1.7.4.1
--
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.
