diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-08-24 12:16:25 -0700 |
|---|---|---|
| committer | Rein Henrichs <rein@puppetlabs.com> | 2010-08-24 12:16:25 -0700 |
| commit | fca886136ab103bba5aa851687f7f97a6b95f8bd (patch) | |
| tree | 2fabceff084cd4757e7a2f878664f91252547d15 /lib | |
| parent | 44e53324275505e89ab1e3c4846299025fd7b1f4 (diff) | |
| download | facter-fca886136ab103bba5aa851687f7f97a6b95f8bd.tar.gz facter-fca886136ab103bba5aa851687f7f97a6b95f8bd.tar.xz facter-fca886136ab103bba5aa851687f7f97a6b95f8bd.zip | |
[#4594] Reintroduce fix for #1291 from original patch
The reverted patch contains a fix for #1291 that is desired. This commit
reintroduces that change.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facter/domain.rb | 3 |
1 files changed, 0 insertions, 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 |