diff options
| -rw-r--r-- | lib/facter/lsb.rb | 2 | ||||
| -rw-r--r-- | lib/facter/networking.rb | 8 | ||||
| -rw-r--r-- | lib/facter/os.rb | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/facter/lsb.rb b/lib/facter/lsb.rb index c372213..9d9dba8 100644 --- a/lib/facter/lsb.rb +++ b/lib/facter/lsb.rb @@ -25,7 +25,7 @@ unless defined?(@@lsbdata) and defined?(@@lsbtime) and (Time.now.to_i - @@lsbtime.to_i < 5) type = nil @@lsbtime = Time.now - @@lsbdata = Facter::Resolution.exec('lsb_release -a 2>/dev/null') + @@lsbdata = Facter::Util::Resolution.exec('lsb_release -a 2>/dev/null') end if pattern.match(@@lsbdata) diff --git a/lib/facter/networking.rb b/lib/facter/networking.rb index 8c80af2..e4cf102 100644 --- a/lib/facter/networking.rb +++ b/lib/facter/networking.rb @@ -29,7 +29,7 @@ # Look for the DNS domain name command first. Facter.add(:domain) do setcode do - domain = Facter::Resolution.exec('dnsdomainname') or nil + domain = Facter::Util::Resolution.exec('dnsdomainname') or nil # make sure it's a real domain if domain and domain =~ /.+\..+/ domain @@ -40,7 +40,7 @@ end Facter.add(:domain) do setcode do - domain = Facter::Resolution.exec('domainname') or nil + domain = Facter::Util::Resolution.exec('domainname') or nil # make sure it's a real domain if domain and domain =~ /.+\..+/ domain @@ -80,7 +80,7 @@ Facter.add(:hostname, :ldapname => "cn") do setcode do hostname = nil - name = Facter::Resolution.exec('hostname') or nil + name = Facter::Util::Resolution.exec('hostname') or nil if name if name =~ /^([\w-]+)\.(.+)$/ hostname = $1 @@ -133,7 +133,7 @@ if hostname = Facter.value(:hostname) # we need Hostname to exist for this to work host = nil - if host = Facter::Resolution.exec("host #{hostname}") + if host = Facter::Util::Resolution.exec("host #{hostname}") host = host.chomp.split(/\s/) if defined? list[-1] and list[-1] =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/ diff --git a/lib/facter/os.rb b/lib/facter/os.rb index 97d8093..796df0d 100644 --- a/lib/facter/os.rb +++ b/lib/facter/os.rb @@ -82,7 +82,7 @@ Facter.add(:operatingsystemrelease) do confine :operatingsystem => %w{CentOS} setcode do - release = Facter::Resolution.exec('rpm -q centos-release') + release = Facter::Util::Resolution.exec('rpm -q centos-release') if release =~ /release-(\d+)/ $1 end @@ -92,7 +92,7 @@ Facter.add(:operatingsystemrelease) do confine :operatingsystem => %w{Debian} setcode do - release = Facter::Resolution.exec('cat /proc/version') + release = Facter::Util::Resolution.exec('cat /proc/version') if release =~ /\(Debian (\d+.\d+).\d+-\d+\)/ $1 end @@ -102,7 +102,7 @@ Facter.add(:operatingsystemrelease) do confine :operatingsystem => %w{Ubuntu} setcode do - release = Facter::Resolution.exec('cat /etc/issue') + release = Facter::Util::Resolution.exec('cat /etc/issue') if release =~ /Ubuntu (\d+.\d+)/ $1 end |