[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, upstream, updated. 3a39dd8353b6308cf49522990104cc63e55d7cda

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 8768371511d081555db63a89be7c1a17a69f4e0c
Author: James Turnbull <james at lovedthanlost.net>
Date:   Sun May 10 19:06:20 2009 +1000

    Fixed #2119 - Added support for non-global Solaris 10 zones

diff --git a/CHANGELOG b/CHANGELOG
index 274a248..1a0adf2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,8 @@
 
     Fixed #2132 - Support for named interfaces under Linux
 
+    Fixed #2119 - Added support for non-global Solaris 10 zones
+
     Fixed #2080 - IPAddress resolutions should be reordered
 
     Fixed #2078 - ip.rb errors command not found
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 78e5485..907f9ca 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -6,6 +6,13 @@ Facter.add("virtual") do
     setcode do
     require 'thread'
 
+        if FileTest.exists?("/sbin/zonename")
+            z = %x{"/sbin/zonename"}.chomp
+            if z != 'global'
+                result = zone 
+            end
+        end
+
         if FileTest.exists?("/proc/user_beancounters")
             # openvz. can be hardware node or virtual environment
             # read the init process' status file, it has laxer permissions

-- 
Packaging of Facter for debian