From fca886136ab103bba5aa851687f7f97a6b95f8bd Mon Sep 17 00:00:00 2001 From: Rein Henrichs Date: Tue, 24 Aug 2010 12:16:25 -0700 Subject: [#4594] Reintroduce fix for #1291 from original patch The reverted patch contains a fix for #1291 that is desired. This commit reintroduces that change. --- lib/facter/domain.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/facter/domain.rb b/lib/facter/domain.rb index b1bba4d..29bb204 100644 --- a/lib/facter/domain.rb +++ b/lib/facter/domain.rb @@ -9,9 +9,6 @@ Facter.add(:domain) do domain = Facter::Util::Resolution.exec('dnsdomainname') next domain if domain =~ /.+\..+/ - domain = Facter::Util::Resolution.exec('domainname') - next domain if domain =~ /.+\..+/ - if FileTest.exists?("/etc/resolv.conf") domain = nil search = nil -- cgit