[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, master, updated. debian/1.6.10-1-203-g1dd0cd5

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit b9cb915fcd06e4aa7519ceb90ef9bb04e58a0114
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Thu Jan 3 00:02:29 2013 +0100

    Move xenu detection fix to a quilt patch
    
    The Debian packaging tools are no longer happy with upstream fixes in the
    packaging branch.  It must be a quilt patch or a gitpkg patch branch.
    
    This also reverts commit 00fb8c9198d237cc3f47ebd9d87a2a61ddd60598.

diff --git a/debian/patches/series b/debian/patches/series
index dd4dba1..63f3a0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no-require-rubygems
+virtual-xenu-detection
diff --git a/debian/patches/virtual-xenu-detection b/debian/patches/virtual-xenu-detection
new file mode 100644
index 0000000..559ecba
--- /dev/null
+++ b/debian/patches/virtual-xenu-detection
@@ -0,0 +1,29 @@
+From 00fb8c9198d237cc3f47ebd9d87a2a61ddd60598 Mon Sep 17 00:00:00 2001
+From: Grant Heffernan <heffergm at gmail.com>
+Date: Wed, 1 Feb 2012 18:38:29 -0500
+Subject: [PATCH 005/132] fix xen0/xenu detection:
+ https://projects.puppetlabs.com/issues/10625
+
+---
+ lib/facter/virtual.rb |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
+index ea9e1bd..652e528 100644
+--- a/lib/facter/virtual.rb
++++ b/lib/facter/virtual.rb
+@@ -73,9 +73,9 @@ Facter.add("virtual") do
+     end
+ 
+     if Facter::Util::Virtual.xen?
+-      if FileTest.exists?("/proc/xen/xsd_kva")
++      if FileTest.exists?("/dev/xen/evtchn")
+         result = "xen0"
+-      elsif FileTest.exists?("/proc/xen/capabilities")
++      elsif FileTest.exists?("/proc/xen")
+         result = "xenu"
+       end
+     end
+-- 
+1.7.10.4
+
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index b9b1fcb..ff85234 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -73,9 +73,9 @@ Facter.add("virtual") do
     end
 
     if Facter::Util::Virtual.xen?
-      if FileTest.exists?("/dev/xen/evtchn")
+      if FileTest.exists?("/proc/xen/xsd_kva")
         result = "xen0"
-      elsif FileTest.exists?("/proc/xen")
+      elsif FileTest.exists?("/proc/xen/capabilities")
         result = "xenu"
       end
     end

-- 
Packaging of Facter for debian