From 2e48e189910f75cc1a6586bbecda27ecbd0afc8e Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Mon, 14 Mar 2011 13:57:32 +1100
Subject: Fixed #6695 - Updated id fact for Darwin et al

---
 lib/facter/id.rb | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/facter/id.rb b/lib/facter/id.rb
index c2c3594..1c42284 100644
--- a/lib/facter/id.rb
+++ b/lib/facter/id.rb
@@ -1,15 +1,8 @@
 Facter.add(:id) do
-    confine :operatingsystem => %w{Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX OEL OVS GNU/kFreeBSD windows}
     setcode "whoami"
 end
 
 Facter.add(:id) do
-    confine :operatingsystem => %w{Solaris}
-    setcode do
-        if %x{id} =~ /^uid=\d+\((\S+)\)/
-            $1
-        else
-            nil
-        end
-    end
+    confine :kernel => :SunOS
+    setcode "/usr/xpg4/bin/id -un"
 end
-- 
cgit