update to 1.6.17

This commit is contained in:
robert 2013-01-14 17:45:36 +00:00
parent 7ead1a207c
commit f6633530a7
4 changed files with 18 additions and 20 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2012/10/08 08:52:48 jasper Exp $ # $OpenBSD: Makefile,v 1.26 2013/01/14 17:45:36 robert Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT= Ruby library for retrieving facts from operating systems COMMENT= Ruby library for retrieving facts from operating systems
VERSION= 1.6.13 VERSION= 1.6.17
DISTNAME= facter-${VERSION} DISTNAME= facter-${VERSION}
PKGNAME= ruby-${DISTNAME} PKGNAME= ruby-${DISTNAME}
CATEGORIES= sysutils CATEGORIES= sysutils

View File

@ -1,2 +1,2 @@
SHA256 (facter-1.6.13.tar.gz) = 8XtBgze30bAt1a6H/x3yHa2nim/iK8XUloB7gsnGaZU= SHA256 (facter-1.6.17.tar.gz) = TI01PZjwf54z5jVZPTwVjbyA9DD6k4hXmZGurGUrhrE=
SIZE (facter-1.6.13.tar.gz) = 115379 SIZE (facter-1.6.17.tar.gz) = 143203

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-lib_facter_util_virtual_rb,v 1.1 2013/01/14 17:45:36 robert Exp $
--- lib/facter/util/virtual.rb.orig Thu Dec 27 19:05:12 2012
+++ lib/facter/util/virtual.rb Mon Jan 14 18:43:57 2013
@@ -11,6 +11,10 @@ module Facter::Util::Virtual
# lspci is a delegating helper method intended to make it easier to stub the
# system call without affecting other calls to Facter::Util::Resolution.exec
def self.lspci(command = "lspci 2>/dev/null")
+ if Facter.value(:kernel) == "OpenBSD"
+ command = "pcidump 2>/dev/null"
+ end
+
Facter::Util::Resolution.exec command
end

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-lib_facter_virtual_rb,v 1.3 2012/05/05 19:29:49 robert Exp $
--- lib/facter/virtual.rb.orig Sat May 5 21:25:43 2012
+++ lib/facter/virtual.rb Sat May 5 21:26:54 2012
@@ -89,7 +89,11 @@ Facter.add("virtual") do
end
if result == "physical"
- output = Facter::Util::Resolution.exec('lspci 2>/dev/null')
+ if Facter.value(:kernel) == "OpenBSD"
+ output = Facter::Util::Resolution.exec('pcidump 2>/dev/null')
+ else
+ output = Facter::Util::Resolution.exec('lspci 2>/dev/null')
+ end
if not output.nil?
output.each_line do |p|
# --- look for the vmware video card to determine if it is virtual => vmware.