[packages/ruby-ohai] drop virtualization-vserver.patch

[glen]

commit 747afbe001fc938c05c5513981e435d6de7eba97
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Dec 4 17:39:54 2014 +0200

    drop virtualization-vserver.patch
    
    use OHAI-182 for chained virtualizations systems

 ruby-ohai.spec               |  2 --
 virtualization-vserver.patch | 56 --------------------------------------------
 2 files changed, 58 deletions(-)
---
diff --git a/ruby-ohai.spec b/ruby-ohai.spec
index ffd7a71..6d86120 100644
--- a/ruby-ohai.spec
+++ b/ruby-ohai.spec
@@ -13,7 +13,6 @@ License:	Apache v2.0
 Group:		Development/Languages
 Source0:	https://github.com/opscode/ohai/archive/%{version}/%{pkgname}-%{version}.tar.gz
 # Source0-md5:	b28339ec7f835a2ed4ec0f876178fb14
-Patch0:		virtualization-vserver.patch
 Patch1:		platform-pld.patch
 Patch2:		soft-net-dhcp.patch
 URL:		http://docs.getchef.com/ohai.html
@@ -64,7 +63,6 @@ This package contains documentation for %{name}.
 
 %prep
 %setup -q -n ohai-%{version}
-#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
diff --git a/virtualization-vserver.patch b/virtualization-vserver.patch
deleted file mode 100644
index 75491a5..0000000
--- a/virtualization-vserver.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-detect vserver before vbox, allowing "vbox-guest" status to overwrite
-"vserver-host" detection
-https://tickets.opscode.com/browse/OHAI-479
-
-Eventually to be dropped in favour of using node[:virtualization][:systems]
-https://tickets.opscode.com/browse/OHAI-182
-
---- ruby-ohai-7.4.0/lib/ohai/plugins/linux/virtualization.rb~	2014-09-06 07:18:08.000000000 +0300
-+++ ruby-ohai-7.4.0/lib/ohai/plugins/linux/virtualization.rb	2014-09-18 00:30:42.946587051 +0300
-@@ -101,6 +101,23 @@
-       virtualization[:systems][:openvz] = "guest"
-     end
- 
-+    # Detect Linux-VServer
-+    if File.exists?("/proc/self/status")
-+      proc_self_status = File.read("/proc/self/status")
-+      vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/)
-+      if vxid and vxid[2]
-+        virtualization[:system] = "linux-vserver"
-+        if vxid[2] == "0"
-+          virtualization[:role] = "host"
-+          virtualization[:systems]["linux-vserver"] = "host"
-+        else
-+          virtualization[:role] = "guest"
-+          virtualization[:systems]["linux-vserver"] = "guest"
-+        end
-+      end
-+    end
-+
-+
-     # http://www.dmo.ca/blog/detecting-virtualization-on-linux
-     if File.exists?("/usr/sbin/dmidecode")
-       so = shell_out("dmidecode")
-@@ -134,22 +151,6 @@
-       end
-     end
- 
--    # Detect Linux-VServer
--    if File.exists?("/proc/self/status")
--      proc_self_status = File.read("/proc/self/status")
--      vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/)
--      if vxid and vxid[2]
--        virtualization[:system] = "linux-vserver"
--        if vxid[2] == "0"
--          virtualization[:role] = "host"
--          virtualization[:systems]["linux-vserver"] = "host"
--        else
--          virtualization[:role] = "guest"
--          virtualization[:systems]["linux-vserver"] = "guest"
--        end
--      end
--    end
--
-     # Detect LXC/Docker
-     #
-     # /proc/self/cgroup will look like this inside a docker container:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-ohai.git/commitdiff/747afbe001fc938c05c5513981e435d6de7eba97