From 4d7b44cf141f9c8d390c3470a18b16c3f036b28d Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Mon, 29 Sep 2008 12:07:51 -0500 Subject: Fixed #1619 - Applying patch by seanmil, adding support for SLES. Signed-off-by: Luke Kanies --- CHANGELOG | 2 ++ lib/facter/hardwareisa.rb | 2 +- lib/facter/id.rb | 2 +- lib/facter/lsbmajdistrelease.rb | 2 +- lib/facter/macaddress.rb | 2 +- lib/facter/uniqueid.rb | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4b0b55a..afd863f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ 1.5.x: + Fixed #1619 - Applying patch by seanmil, adding support for SLES. + Fixed #1509 - Fixed version recognition for SLES. Fixes #1582 - Fix MAC address reporting for Linux bonding slave interfaces diff --git a/lib/facter/hardwareisa.rb b/lib/facter/hardwareisa.rb index 4dce535..5f7de43 100644 --- a/lib/facter/hardwareisa.rb +++ b/lib/facter/hardwareisa.rb @@ -1,4 +1,4 @@ Facter.add(:hardwareisa) do setcode 'uname -p', '/bin/sh' - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo FreeBSD OpenBSD NetBSD} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo FreeBSD OpenBSD NetBSD} end diff --git a/lib/facter/id.rb b/lib/facter/id.rb index 41db22f..15b021a 100644 --- a/lib/facter/id.rb +++ b/lib/facter/id.rb @@ -1,4 +1,4 @@ Facter.add(:id) do - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo AIX} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo AIX} setcode "whoami" end diff --git a/lib/facter/lsbmajdistrelease.rb b/lib/facter/lsbmajdistrelease.rb index 44f3b9b..4b2bac8 100644 --- a/lib/facter/lsbmajdistrelease.rb +++ b/lib/facter/lsbmajdistrelease.rb @@ -3,7 +3,7 @@ require 'facter' Facter.add("lsbmajdistrelease") do - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo} setcode do if /(\d*)\./i =~ Facter.value(:lsbdistrelease) result=$1 diff --git a/lib/facter/macaddress.rb b/lib/facter/macaddress.rb index 11dceb0..28ded4c 100644 --- a/lib/facter/macaddress.rb +++ b/lib/facter/macaddress.rb @@ -1,5 +1,5 @@ Facter.add(:macaddress) do - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo Ubuntu} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo Ubuntu} setcode do ether = [] output = %x{/sbin/ifconfig -a} diff --git a/lib/facter/uniqueid.rb b/lib/facter/uniqueid.rb index d1553c5..b86321c 100644 --- a/lib/facter/uniqueid.rb +++ b/lib/facter/uniqueid.rb @@ -1,4 +1,4 @@ Facter.add(:uniqueid) do setcode 'hostid', '/bin/sh' - confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE Debian Gentoo AIX} + confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Gentoo AIX} end -- cgit