← Back to branch summary

~gandelman-a/ubuntu/precise/facter/merge922788

« back to all changes in this revision

Viewing changes to lib/facter/util/manufacturer.rb

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2011-10-18 10:32:42 UTC
  • mfrom: (1.3.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: package-import@ubuntu.com-20111018103242-ag8i8vejfp8v7b1b
Tags: upstream-1.6.1
Import upstream version 1.6.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/facter/util/manufacturer.rb
53
53
    def self.sysctl_find_system_info(name)
54
54
        name.each do |sysctlkey,facterkey|
55
55
            Facter.add(facterkey) do
56
 
                confine :kernel => :openbsd
 
56
                confine :kernel => [:openbsd, :darwin]
57
57
                setcode do
58
 
                    Facter::Util::Resolution.exec("sysctl -n " + sysctlkey)
 
58
                    Facter::Util::Resolution.exec("sysctl -n #{sysctlkey} 2>/dev/null")
59
59
                end
60
60
            end
61
61
        end
79
79
                end
80
80
            end
81
81
        end
 
82
 
 
83
        Facter.add('serialnumber') do
 
84
          setcode do
 
85
            Facter::Util::Resolution.exec("/usr/sbin/sneep")
 
86
          end
 
87
        end
82
88
    end
83
89
 
84
90
    def self.win32_find_system_info(name)
85
 
        require 'win32ole'
 
91
        require 'facter/util/wmi'
86
92
        value = ""
87
 
        wmi = WIN32OLE.connect("winmgmts://")
 
93
        wmi = Facter::Util::WMI.connect()
88
94
        name.each do |facterkey, win32key|
89
95
            query = wmi.ExecQuery("select * from Win32_#{win32key.last}")
90
96
            Facter.add(facterkey) do
96
102
            end
97
103
        end
98
104
    end
99
 
 
100
105
end