summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2006-06-19 19:04:48 +0000
committerluke <luke@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2006-06-19 19:04:48 +0000
commit73aeadeaed9b40da9b72a94334d8f0be80220c0f (patch)
tree215af53606acb6fd7a39a48f077804eb92584776
parent6ac796d179d115df26cc8323abd357851e4da13e (diff)
downloadfacter-73aeadeaed9b40da9b72a94334d8f0be80220c0f.tar.gz
facter-73aeadeaed9b40da9b72a94334d8f0be80220c0f.tar.xz
facter-73aeadeaed9b40da9b72a94334d8f0be80220c0f.zip
adding a call to dnsdomainname before domainname
git-svn-id: http://reductivelabs.com/svn/facter/trunk@137 1f5c1d6a-bddf-0310-8f58-fc49e503516a
-rw-r--r--lib/facter.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/facter.rb b/lib/facter.rb
index c663c8c..1b497c8 100644
--- a/lib/facter.rb
+++ b/lib/facter.rb
@@ -687,6 +687,18 @@ class Facter
end
end
end
+ # Look for the DNS domain name command first.
+ Facter.add("Domain") do
+ setcode do
+ domain = Resolution.exec('dnsdomainname') or nil
+ # make sure it's a real domain
+ if domain and domain =~ /.+\..+/
+ domain
+ else
+ nil
+ end
+ end
+ end
Facter.add("Domain") do
setcode do
domain = Resolution.exec('domainname') or nil