diff options
| -rw-r--r-- | CHANGELOG | 9 | ||||
| -rwxr-xr-x | conf/osx/createpackage.sh | 3 | ||||
| -rw-r--r-- | conf/redhat/facter.spec | 2 | ||||
| -rw-r--r-- | lib/facter/ipmess.rb | 2 |
4 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,12 @@ +1.5.x: + Fixed #1575 - CentOS fix for Facter SPEC file + + Fixed #1569 - createpackage.sh bug + + Fixed #1567 - createpackage.sh output + + Fixed #1547 - finally killed dots in IP address facts + 1.5.2: Fixed #1562 - Removed facter from PREREQS diff --git a/conf/osx/createpackage.sh b/conf/osx/createpackage.sh index d8c2c52..4e99c91 100755 --- a/conf/osx/createpackage.sh +++ b/conf/osx/createpackage.sh @@ -49,7 +49,8 @@ function find_facter_root() { function install_facter() { echo "Installing Facter to ${pkgroot}" - "${installer}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sitelibdir="${SITELIBDIR}" &> /dev/null + cd "$facter_root" + ./"${INSTALLRB}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sitelibdir="${SITELIBDIR}" chown -R root:admin "${pkgroot}" } diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec index 92e5d5a..4433cbf 100644 --- a/conf/redhat/facter.spec +++ b/conf/redhat/facter.spec @@ -1,6 +1,6 @@ %{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} -%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5 +%define has_ruby_abi 0%{?fedora:%fedora} >= 5 || 0%{?rhel:%rhel} >= 5 || 0%{?centos:%centos} >= 5 %define has_ruby_noarch %has_ruby_abi Summary: Ruby module for collecting simple facts about a host operating system diff --git a/lib/facter/ipmess.rb b/lib/facter/ipmess.rb index badf95f..e879300 100644 --- a/lib/facter/ipmess.rb +++ b/lib/facter/ipmess.rb @@ -17,7 +17,7 @@ end case Facter.value(:kernel) when 'SunOS', 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD' Facter::IPAddress.get_interfaces.each do |interface| - mi = interface.gsub('/:|\./', '_') + mi = interface.gsub(/[:.]/, '_') Facter.add("ipaddress_" + mi) do confine :kernel => [ :sunos, :freebsd, :openbsd, :netbsd, :linux ] |