- update to facter-2.2.0

* https://docs.puppetlabs.com/facter/2.2/release_notes.html
This commit is contained in:
jasper 2014-08-26 07:03:31 +00:00
parent e8cb4bc301
commit 2c8f7d894a
7 changed files with 21 additions and 108 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.61 2014/07/21 15:51:16 jasper Exp $
# $OpenBSD: Makefile,v 1.62 2014/08/26 07:03:31 jasper Exp $
COMMENT= Ruby library for retrieving facts from operating systems
VERSION= 2.1.0
REVISION= 1
VERSION= 2.2.0
DISTNAME= facter-${VERSION}
CATEGORIES= sysutils

View File

@ -1,2 +1,2 @@
SHA256 (facter-2.1.0.tar.gz) = 0RdJ1Y8D87YO4A1V5RyG9wIHOB8W6rmXEih/7X55GSQ=
SIZE (facter-2.1.0.tar.gz) = 230452
SHA256 (facter-2.2.0.tar.gz) = Mdt0IvAUA5Q9R7wPChwjjOO0xW708c+1+TbxMgixi2I=
SIZE (facter-2.2.0.tar.gz) = 241732

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-lib_facter_partitions_rb,v 1.2 2014/07/09 17:30:55 jasper Exp $
From 832af388fa3e0bd265194a40d820000cf0d043fb Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Wed, 9 Jul 2014 16:52:27 +0200
Subject: [PATCH] (FACT-621) Add OpenBSD support for 'partitions' fact.
--- lib/facter/partitions.rb.orig Wed Jul 9 16:48:07 2014
+++ lib/facter/partitions.rb Wed Jul 9 16:48:30 2014
@@ -7,7 +7,7 @@
# Parse the contents of /sys/block/<device>/size to receive the size (multiplying by 512 to correct for blocks-to-bytes)
#
# Caveats:
-# Only supports Linux 2.6+ at this time, due to the reliance on sysfs
+# For Linux only 2.6+ is supported at this time, due to the reliance on sysfs
#
# Author: Chris Portman <chris@portman.net.au>

View File

@ -1,45 +0,0 @@
$OpenBSD: patch-lib_facter_util_partitions_openbsd_rb,v 1.2 2014/07/09 17:30:55 jasper Exp $
From 832af388fa3e0bd265194a40d820000cf0d043fb Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Wed, 9 Jul 2014 16:52:27 +0200
Subject: [PATCH] (FACT-621) Add OpenBSD support for 'partitions' fact.
--- lib/facter/util/partitions/openbsd.rb.orig Wed Jul 9 17:07:42 2014
+++ lib/facter/util/partitions/openbsd.rb Wed Jul 9 17:08:05 2014
@@ -0,0 +1,35 @@
+module Facter::Util::Partitions
+ module OpenBSD
+ def self.list
+ Facter::Core::Execution.exec('df').scan(/\/dev\/(\S+)/).flatten
+ end
+
+ # On OpenBSD partitions don't have a UUID; disks have DUID but that's not
+ # compatible.
+ def self.uuid(partition)
+ nil
+ end
+
+ def self.mount(partition)
+ scan_mount(/\/dev\/#{partition}\son\s(\S+)/)
+ end
+
+ # Reported size is in 1K blocks
+ def self.size(partition)
+ scan_df(/\/dev\/#{partition}\s+(\S+)/)
+ end
+
+ def self.filesystem(partition)
+ scan_mount(/\/dev\/#{partition}\son\s\S+\stype\s(\S+)/)
+ end
+
+ private
+ def self.scan_mount(scan_regex)
+ Facter::Core::Execution.exec('mount').scan(scan_regex).flatten.first
+ end
+
+ def self.scan_df(scan_regex)
+ Facter::Core::Execution.exec('df -k').scan(scan_regex).flatten.first
+ end
+ end
+end

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-lib_facter_util_partitions_rb,v 1.2 2014/07/09 17:30:55 jasper Exp $
From 832af388fa3e0bd265194a40d820000cf0d043fb Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Wed, 9 Jul 2014 16:52:27 +0200
Subject: [PATCH] (FACT-621) Add OpenBSD support for 'partitions' fact.
--- lib/facter/util/partitions.rb.orig Wed Jul 9 16:48:36 2014
+++ lib/facter/util/partitions.rb Wed Jul 9 16:48:42 2014
@@ -1,8 +1,10 @@
require 'facter/util/partitions/linux'
+require 'facter/util/partitions/openbsd'
module Facter::Util::Partitions
IMPLEMENTATIONS = {
- 'Linux' => Linux
+ 'Linux' => Linux,
+ 'OpenBSD' => OpenBSD,
}
module NoImplementation

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-lib_facter_virtual_rb,v 1.10 2014/07/02 19:08:19 jasper Exp $
From e33c0234dbda5bcc50ad04dd645ee88ea8b9f114 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Wed, 2 Jul 2014 16:51:33 +0200
Subject: [PATCH] (FACT-595) Unbreak {is_,}virtual fact for OpenBSD when running on KVM.
--- lib/facter/virtual.rb.orig Tue Jun 24 22:10:42 2014
+++ lib/facter/virtual.rb Wed Jun 25 23:57:16 2014
@@ -74,6 +74,8 @@ Facter.add("virtual") do
next "vmware" if lines.any? {|l| l =~ /VM[wW]are/ }
next "virtualbox" if lines.any? {|l| l =~ /VirtualBox/ }
next "xenhvm" if lines.any? {|l| l =~ /HVM domU/ }
+ next "ovirt" if lines.any? {|l| l =~ /oVirt Node/ }
+ next "kvm" if lines.any? {|l| l =~ /KVM/ }
end
end
end

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2014/07/21 15:51:16 jasper Exp $
@comment $OpenBSD: PLIST,v 1.17 2014/08/26 07:03:31 jasper Exp $
bin/facter
${MODRUBY_SITEDIR}/facter/
${MODRUBY_SITEDIR}/facter.rb
@ -29,6 +29,7 @@ ${MODRUBY_SITEDIR}/facter/fqdn.rb
${MODRUBY_SITEDIR}/facter/gce/
${MODRUBY_SITEDIR}/facter/gce.rb
${MODRUBY_SITEDIR}/facter/gce/metadata.rb
${MODRUBY_SITEDIR}/facter/gid.rb
${MODRUBY_SITEDIR}/facter/hardwareisa.rb
${MODRUBY_SITEDIR}/facter/hardwaremodel.rb
${MODRUBY_SITEDIR}/facter/hostname.rb
@ -47,6 +48,7 @@ ${MODRUBY_SITEDIR}/facter/lsbdistdescription.rb
${MODRUBY_SITEDIR}/facter/lsbdistid.rb
${MODRUBY_SITEDIR}/facter/lsbdistrelease.rb
${MODRUBY_SITEDIR}/facter/lsbmajdistrelease.rb
${MODRUBY_SITEDIR}/facter/lsbminordistrelease.rb
${MODRUBY_SITEDIR}/facter/lsbrelease.rb
${MODRUBY_SITEDIR}/facter/macaddress.rb
${MODRUBY_SITEDIR}/facter/macosx.rb
@ -54,20 +56,34 @@ ${MODRUBY_SITEDIR}/facter/manufacturer.rb
${MODRUBY_SITEDIR}/facter/memory.rb
${MODRUBY_SITEDIR}/facter/netmask.rb
${MODRUBY_SITEDIR}/facter/network.rb
${MODRUBY_SITEDIR}/facter/operatingsystem/
${MODRUBY_SITEDIR}/facter/operatingsystem.rb
${MODRUBY_SITEDIR}/facter/operatingsystem/base.rb
${MODRUBY_SITEDIR}/facter/operatingsystem/cumuluslinux.rb
${MODRUBY_SITEDIR}/facter/operatingsystem/implementation.rb
${MODRUBY_SITEDIR}/facter/operatingsystem/linux.rb
${MODRUBY_SITEDIR}/facter/operatingsystem/sunos.rb
${MODRUBY_SITEDIR}/facter/operatingsystem/vmkernel.rb
${MODRUBY_SITEDIR}/facter/operatingsystem/windows.rb
${MODRUBY_SITEDIR}/facter/operatingsystemmajrelease.rb
${MODRUBY_SITEDIR}/facter/operatingsystemrelease.rb
${MODRUBY_SITEDIR}/facter/os.rb
${MODRUBY_SITEDIR}/facter/osfamily.rb
${MODRUBY_SITEDIR}/facter/partitions.rb
${MODRUBY_SITEDIR}/facter/path.rb
${MODRUBY_SITEDIR}/facter/physicalprocessorcount.rb
${MODRUBY_SITEDIR}/facter/processor.rb
${MODRUBY_SITEDIR}/facter/processors/
${MODRUBY_SITEDIR}/facter/processors.rb
${MODRUBY_SITEDIR}/facter/processors/os.rb
${MODRUBY_SITEDIR}/facter/ps.rb
${MODRUBY_SITEDIR}/facter/puppetversion.rb
${MODRUBY_SITEDIR}/facter/rackspace.rb
${MODRUBY_SITEDIR}/facter/rubysitedir.rb
${MODRUBY_SITEDIR}/facter/rubyversion.rb
${MODRUBY_SITEDIR}/facter/selinux.rb
${MODRUBY_SITEDIR}/facter/ssh.rb
${MODRUBY_SITEDIR}/facter/system_uptime.rb
${MODRUBY_SITEDIR}/facter/timezone.rb
${MODRUBY_SITEDIR}/facter/uniqueid.rb
${MODRUBY_SITEDIR}/facter/uptime.rb