facter 1.5.8 → 1.5.9

data/lib/facter/netmask.rb

@@ -9,7 +9,7 @@
 require 'facter/util/netmask'
 
 Facter.add("netmask") do
-    confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin ]
+    confine :kernel => [ :sunos, :linux, :freebsd, :openbsd, :netbsd, :darwin, :"gnu/kfreebsd" ]
     setcode do
         Facter::NetMask.get_netmask
     end

data/lib/facter/operatingsystem.rb

@@ -32,10 +32,14 @@ Facter.add(:operatingsystem) do
             end
         elsif FileTest.exists?("/etc/arch-release")
             "Arch"
+        elsif FileTest.exists?("/etc/vmware-release")
+            "VMWareESX"
         elsif FileTest.exists?("/etc/redhat-release")
             txt = File.read("/etc/redhat-release")
             if txt =~ /centos/i
                 "CentOS"
+            elsif txt =~ /scientific/i 
+                "Scientific"
             else
                 "RedHat"
             end
@@ -50,12 +54,23 @@ Facter.add(:operatingsystem) do
             else
                 "SuSE"
             end
-	elsif FileTest.exists?("/etc/slackware-version")
-	    "Slackware"
+        elsif FileTest.exists?("/etc/bluewhite64-version")
+            "Bluewhite64"
+        elsif FileTest.exists?("/etc/slamd64-version")
+            "Slamd64"
+        elsif FileTest.exists?("/etc/slackware-version")
+            "Slackware"
         end
     end
 end
 
+Facter.add(:operatingsystem) do
+    confine :kernel => "VMkernel"
+    setcode do
+        "ESXi"
+    end
+end
+
 Facter.add(:operatingsystem) do
     # Default to just returning the kernel as the operating system
     setcode do Facter[:kernel].value end

data/lib/facter/operatingsystemrelease.rb

@@ -71,6 +71,40 @@ Facter.add(:operatingsystemrelease) do
     end
 end
 
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{Bluewhite64}
+    setcode do
+        releasefile = Facter::Util::Resolution.exec('cat /etc/bluewhite64-version')
+        if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
+            $1 + "." + $2
+        else
+            "unknown"
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{VMwareESX}
+    setcode do
+        release = Facter::Util::Resolution.exec('vmware -v')
+        if release =~ /VMware ESX .*?(\d.*)/
+            $1
+        end
+    end
+end
+
+Facter.add(:operatingsystemrelease) do
+    confine :operatingsystem => %w{Slamd64}
+    setcode do
+        releasefile = Facter::Util::Resolution.exec('cat /etc/slamd64-version')
+        if releasefile =~ /^\s*\w+\s+(\d+)\.(\d+)/
+            $1 + "." + $2
+        else
+            "unknown"
+        end
+    end
+end
+
 Facter.add(:operatingsystemrelease) do
     setcode do Facter[:kernelrelease].value end
 end

data/lib/facter/processor.rb

@@ -7,7 +7,7 @@
 
 require 'thread'
 
-if Facter.value(:kernel) == "Linux"
+if ["Linux", "GNU/kFreeBSD"].include? Facter.value(:kernel)
     processor_num = -1
     processor_list = []
     Thread::exclusive do
@@ -17,12 +17,15 @@ if Facter.value(:kernel) == "Linux"
             elsif l =~ /model name\s+:\s+(.*)\s*$/
                 processor_list[processor_num] = $1 unless processor_num == -1
                 processor_num = -1
+            elsif l =~ /processor\s+(\d+):\s+(.*)/
+                processor_num = $1.to_i
+                processor_list[processor_num] = $2 unless processor_num == -1
             end
         end
     end
 
     Facter.add("ProcessorCount") do
-        confine :kernel => :linux
+        confine :kernel => [ :linux, :"gnu/kfreebsd" ]
         setcode do
             processor_list.length.to_s
         end
@@ -30,7 +33,7 @@ if Facter.value(:kernel) == "Linux"
 
     processor_list.each_with_index do |desc, i|
         Facter.add("Processor#{i}") do
-            confine :kernel => :linux
+            confine :kernel => [ :linux, :"gnu/kfreebsd" ]
             setcode do
                 desc
             end
@@ -80,9 +83,9 @@ if Facter.value(:kernel) == "OpenBSD"
             Facter::Util::Resolution.exec("uname -p")
         end
     end
-    
+
     Facter.add("ProcessorCount") do
-        confine :kernel => :openbsd 
+        confine :kernel => :openbsd
         setcode do
             Facter::Util::Resolution.exec("sysctl hw.ncpu | cut -d'=' -f2")
         end

data/lib/facter/selinux.rb

@@ -4,7 +4,7 @@
 Facter.add("selinux") do
     confine :kernel => :linux
 
-    setcode do 
+    setcode do
         result = "false"
         if FileTest.exists?("/selinux/enforce")
             if FileTest.exists?("/proc/self/attr/current")
@@ -31,15 +31,48 @@ end
 
 Facter.add("selinux_policyversion") do
     confine :selinux => :true
-    setcode do 
+    setcode do
         File.read("/selinux/policyvers")
     end
 end
 
-Facter.add("selinux_mode") do
+Facter.add("selinux_current_mode") do
+    confine :selinux => :true
+    setcode do
+	result = 'unknown'
+        mode = Facter::Util::Resolution.exec('/usr/sbin/sestatus')
+        mode.each_line { |l| result = $1 if l =~ /^Current mode\:\s+(\w+)$/i }
+        result.chomp
+    end
+end
+
+Facter.add("selinux_config_mode") do
     confine :selinux => :true
     setcode do
-        %x{/usr/sbin/sestatus | /bin/grep "Policy from config file:" | awk '{print $5}'}        
+        result = 'unknown'
+        mode = Facter::Util::Resolution.exec('/usr/sbin/sestatus')
+        mode.each_line { |l| result = $1 if l =~ /^Mode from config file\:\s+(\w+)$/i }
+        result.chomp
     end
 end
 
+Facter.add("selinux_config_policy") do
+    confine :selinux => :true
+    setcode do
+        result = 'unknown'
+        mode = Facter::Util::Resolution.exec('/usr/sbin/sestatus')
+        mode.each_line { |l| result = $1 if l =~ /^Policy from config file\:\s+(\w+)$/i }
+        result.chomp
+    end
+end
+
+# This is a legacy fact which returns the old selinux_mode fact value to prevent 
+# breakages of existing manifests. It should be removed at the next major release.
+# See ticket #6677.
+
+Facter.add("selinux_mode") do
+    confine :selinux => :true
+    setcode do
+        Facter.value(:selinux_config_policy)
+    end
+end

data/lib/facter/uniqueid.rb

@@ -1,4 +1,4 @@
 Facter.add(:uniqueid) do
     setcode 'hostid', '/bin/sh'
-    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS GNU/kFreeBSD}
 end

data/lib/facter/util/#uptime.rb#

@@ -0,0 +1,64 @@
+require 'time'
+
+# A module to gather uptime facts
+#
+module Facter::Util::Uptime
+    def self.get_uptime_seconds_unix
+        uptime_proc_uptime or uptime_sysctl or uptime_kstat or uptime_who_dash_b
+    end
+
+    def self.get_uptime_seconds_win
+      require 'win32ole'
+      wmi = WIN32OLE.connect("winmgmts://")
+      query = wmi.ExecQuery("select * from Win32_OperatingSystem")
+      last_boot = ""
+      query.each { |x| last_boot = x.LastBootupTime}
+      self.compute_uptime(Time.parse(last_boot.split('.').first))
+    end
+
+    private
+
+    def self.uptime_proc_uptime
+        if output = Facter::Util::Resolution.exec("/bin/cat #{uptime_file} 2>/dev/null")
+            output.chomp.split(" ").first.to_i
+        end
+    end
+
+    def self.uptime_sysctl
+        if output = Facter::Util::Resolution.exec("#{uptime_sysctl_cmd} 2>/dev/null")
+            compute_uptime(Time.at(output.unpack('L').first))
+        end
+    end
+
+    def self.uptime_kstat
+        if output = Facter::Util::Resolution.exec("#{uptime_kstat_cmd} 2>/dev/null")
+            compute_uptime(Time.at(output.chomp.split(/\s/).last.to_i))
+        end
+    end
+
+    def self.uptime_who_dash_b
+        if output = Facter::Util::Resolution.exec("#{uptime_who_cmd} 2>/dev/null")
+            compute_uptime(Time.parse(output))
+        end
+    end
+
+    def self.compute_uptime(time)
+        (Time.now - time).to_i
+    end
+
+    def self.uptime_file
+        "/proc/uptime"
+    end
+
+    def self.uptime_sysctl_cmd
+        'sysctl -b kern.boottime'
+    end
+
+    def self.uptime_kstat_cmd
+        'kstat -p unix:::boot_time'
+    end
+
+    def self.uptime_who_cmd
+        'who -b'
+    end
+end

data/lib/facter/util/ip.rb

@@ -6,17 +6,20 @@ module Facter::Util::IP
     REGEX_MAP = {
         :linux => {
             :ipaddress  => /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :ipaddress6 => /inet6 addr: ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
             :macaddress => /(?:ether|HWaddr)\s+(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
             :netmask    => /Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
         },
         :bsd   => {
-            :aliases    => [:openbsd, :netbsd, :freebsd, :darwin],
+            :aliases    => [:openbsd, :netbsd, :freebsd, :darwin, :"gnu/kfreebsd"],
             :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-            :macaddress => /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/,
+            :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+            :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
             :netmask    => /netmask\s+0x(\w{8})/
         },
         :sunos => {
             :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+            :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
             :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
             :netmask    => /netmask\s+(\w{8})/
         },
@@ -33,7 +36,7 @@ module Facter::Util::IP
     end
 
     def self.convert_from_hex?(kernel)
-        kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin, :"hp-ux"]
+        kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin, :"hp-ux", :"gnu/kfreebsd"]
         kernels_to_convert.include?(kernel)
     end
 
@@ -56,17 +59,17 @@ module Facter::Util::IP
         # at the end of interfaces.  So, we have to trim those trailing
         # characters.  I tried making the regex better but supporting all
         # platforms with a single regex is probably a bit too much.
-        output.scan(/^[-\w]+[.:]?\d+[.:]?\d*[.:]?\w*/).collect { |i| i.sub(/:$/, '') }.uniq
+        output.scan(/^\S+/).collect { |i| i.sub(/:$/, '') }.uniq
     end
 
     def self.get_all_interface_output
         case Facter.value(:kernel)
-        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin'
+        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD'
             output = %x{/sbin/ifconfig -a}
         when 'SunOS'
             output = %x{/usr/sbin/ifconfig -a}
         when 'HP-UX'
-            output = %x{/bin/netstat -i}
+            output = %x{/bin/netstat -in | sed -e 1d}
         end
         output
     end
@@ -74,7 +77,7 @@ module Facter::Util::IP
     def self.get_single_interface_output(interface)
         output = ""
         case Facter.value(:kernel)
-        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin'
+        when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD'
             output = %x{/sbin/ifconfig #{interface}}
         when 'SunOS'
             output = %x{/usr/sbin/ifconfig #{interface}}
@@ -138,15 +141,13 @@ module Facter::Util::IP
         else
             output_int = get_single_interface_output(interface)
 
-            if interface != /^lo[0:]?\d?/
-                output_int.each_line do |s|
-                    if s =~ regex
-                        value = $1
+            output_int.each_line do |s|
+                if s =~ regex
+                    value = $1
                         if label == 'netmask' && convert_from_hex?(kernel)
                             value = value.scan(/../).collect do |byte| byte.to_i(16) end.join('.')
                         end
-                        tmp1.push(value)
-                    end
+                    tmp1.push(value)
                 end
             end
 
@@ -155,17 +156,24 @@ module Facter::Util::IP
             end
         end
     end
-  
+
     def self.get_network_value(interface)
         require 'ipaddr'
 
         ipaddress = get_interface_value(interface, "ipaddress")
         netmask = get_interface_value(interface, "netmask")
-        
+
         if ipaddress && netmask
             ip = IPAddr.new(ipaddress, Socket::AF_INET)
             subnet = IPAddr.new(netmask, Socket::AF_INET)
             network = ip.mask(subnet.to_s).to_s
         end
     end
+
+    def self.get_arp_value(interface)
+        arp = Facter::Util::Resolution.exec("arp -en -i #{interface} | sed -e 1d")
+        if arp =~ /^\S+\s+\w+\s+(\S+)\s+\w\s+\S+$/
+         return $1
+        end
+    end
 end

data/lib/facter/util/loader.rb

@@ -30,7 +30,7 @@ class Facter::Util::Loader
         search_path.each do |dir|
             next unless FileTest.directory?(dir)
 
-            Dir.entries(dir).each do |file|
+            Dir.entries(dir).sort.each do |file|
                 path = File.join(dir, file)
                 if File.directory?(path)
                     load_dir(path)
@@ -62,7 +62,7 @@ class Facter::Util::Loader
     def load_dir(dir)
         return if dir =~ /\/\.+$/ or dir =~ /\/util$/ or dir =~ /\/lib$/
 
-        Dir.entries(dir).find_all { |f| f =~ /\.rb$/ }.each do |file|
+        Dir.entries(dir).find_all { |f| f =~ /\.rb$/ }.sort.each do |file|
             load_file(File.join(dir, file))
         end
     end

data/lib/facter/util/macaddress.rb

@@ -0,0 +1,28 @@
+# A module to gather macaddress facts
+#
+module Facter::Util::Macaddress
+
+  module Darwin
+    def self.macaddress
+      iface = default_interface
+      Facter.warn "Could not find a default route. Using first non-loopback interface" if iface.empty?
+
+      macaddress = `#{ifconfig_command} #{iface} | /usr/bin/awk '/ether/{print $2;exit}'`.chomp
+      macaddress.empty? ? nil : macaddress
+    end
+
+    def self.default_interface
+      `#{netstat_command} | /usr/bin/awk  '/^default/{print $6;exit}'`.chomp
+    end
+
+    private
+
+    def self.netstat_command
+      '/usr/sbin/netstat -rn'
+    end
+
+    def self.ifconfig_command
+      '/sbin/ifconfig'
+    end
+  end
+end

data/lib/facter/util/manufacturer.rb

@@ -5,7 +5,7 @@ module Facter::Manufacturer
 
     def self.get_dmi_table()
         case Facter.value(:kernel)
-        when 'Linux'
+        when 'Linux', 'GNU/kFreeBSD'
             return nil unless FileTest.exists?("/usr/sbin/dmidecode")
 
             output=%x{/usr/sbin/dmidecode 2>/dev/null}
@@ -38,7 +38,7 @@ module Facter::Manufacturer
                         if line =~ /#{key}/ and line =~ /\n\s+#{value} (.+)\n/
                             result = $1.strip
                             Facter.add(facterkey) do
-                                confine :kernel => [ :linux, :freebsd, :netbsd, :sunos ]
+                                confine :kernel => [ :linux, :freebsd, :netbsd, :sunos, :"gnu/kfreebsd" ]
                                 setcode do
                                     result
                                 end
@@ -60,4 +60,41 @@ module Facter::Manufacturer
             end
         end
     end
+
+    def self.prtdiag_sparc_find_system_info()
+        # Parses prtdiag for a SPARC architecture string, won't work with Solaris x86
+        output = Facter::Util::Resolution.exec('/usr/sbin/prtdiag')
+
+        # System Configuration:  Sun Microsystems  sun4u Sun SPARC Enterprise M3000 Server
+        sysconfig = output.split("\n")[0]
+        if sysconfig =~ /^System Configuration:\s+(.+?)\s+(sun\d+\S+)\s+(.+)/ then
+            Facter.add('manufacturer') do
+                setcode do
+                    $1
+                end
+            end
+            Facter.add('productname') do
+                setcode do
+                    $3
+                end
+            end
+        end
+    end
+
+    def self.win32_find_system_info(name)
+        require 'win32ole'
+        value = ""
+        wmi = WIN32OLE.connect("winmgmts://")
+        name.each do |facterkey, win32key|
+            query = wmi.ExecQuery("select * from Win32_#{win32key.last}")
+            Facter.add(facterkey) do
+                confine :kernel => :windows
+                setcode do
+                    query.each { |x| value = x.__send__( (win32key.first).to_sym) }
+                    value
+                end
+            end
+        end
+    end
+
 end