From 8a38aa5fba57ec1c8f5d7636912a69afc7cc5b2a Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Tue, 21 Oct 2008 10:26:29 +1100
Subject: Added Ubuntu to a variety of confines

---
 CHANGELOG                       | 2 ++
 lib/facter/hardwareisa.rb       | 2 +-
 lib/facter/id.rb                | 2 +-
 lib/facter/lsbmajdistrelease.rb | 2 +-
 lib/facter/uniqueid.rb          | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6a2c06f..0c581e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 1.5.x:
+    Added Ubuntu to a variety of confines
+
     Fixed #1619 - Applying patch by seanmil, adding support for SLES.
     
     Fixed #1634 - Update virtual fact to differentiate OpenVZ 
diff --git a/lib/facter/hardwareisa.rb b/lib/facter/hardwareisa.rb
index 5f7de43..6a67d96 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 SLES Debian Gentoo FreeBSD OpenBSD NetBSD}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo FreeBSD OpenBSD NetBSD}
 end
diff --git a/lib/facter/id.rb b/lib/facter/id.rb
index 15b021a..6157991 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 SLES Debian Gentoo AIX}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX}
     setcode "whoami"
 end
diff --git a/lib/facter/lsbmajdistrelease.rb b/lib/facter/lsbmajdistrelease.rb
index 4b2bac8..f84c3c1 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 SLES Debian Gentoo}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo}
     setcode do
         if /(\d*)\./i =~ Facter.value(:lsbdistrelease)
             result=$1
diff --git a/lib/facter/uniqueid.rb b/lib/facter/uniqueid.rb
index b86321c..b199865 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 SLES Debian Gentoo AIX}
+    confine :operatingsystem => %w{Solaris Linux Fedora RedHat CentOS SuSE SLES Debian Ubuntu Gentoo AIX}
 end
-- 
cgit