diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-03-17 02:41:02 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2011-03-17 02:41:02 +1100 |
| commit | fd4d26014b9c86d169713d9f4374cc4477f22616 (patch) | |
| tree | d48f3c441ecb29016bbf9fe54578b14c4326a966 /lib | |
| parent | 458a22d472334e4239397f3077e6366a9d7e9973 (diff) | |
| parent | 2e48e189910f75cc1a6586bbecda27ecbd0afc8e (diff) | |
| download | facter-fd4d26014b9c86d169713d9f4374cc4477f22616.tar.gz facter-fd4d26014b9c86d169713d9f4374cc4477f22616.tar.xz facter-fd4d26014b9c86d169713d9f4374cc4477f22616.zip | |
Merge branch 'tickets/master/6695' into next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facter/id.rb | 11 |
1 files changed, 2 insertions, 9 deletions
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 |