Updating Puppet to work with the new Facter

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@794 980ebf18-57e1-0310-9a29-db15c13687c0

4 files changed, 26 insertions, 24 deletions

diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb
index 9e10ae01b..bc9fd6566 100755
--- a/lib/puppet/type/cron.rb
+++ b/lib/puppet/type/cron.rb
@@ -332,7 +332,7 @@ module Puppet
         @instances = {}
 
         case Facter["operatingsystem"].value
-        when "SunOS":
+        when "Solaris":
             @crontype = Puppet::CronType::SunOS
         else
             @crontype = Puppet::CronType::Default
diff --git a/lib/puppet/type/nameservice/objectadd.rb b/lib/puppet/type/nameservice/objectadd.rb
index df2a94902..ea6fc2313 100644
--- a/lib/puppet/type/nameservice/objectadd.rb
+++ b/lib/puppet/type/nameservice/objectadd.rb
@@ -103,7 +103,7 @@ module Puppet
                         cmd << state.class.objectaddflag << "'%s'" % state.should
                     }
                     # stupid fedora
-                    case Facter["distro"].value
+                    case Facter["operatingsystem"].value
                     when "Fedora", "RedHat":
                         cmd << "-M"
                     else
diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb
index 24246f908..5f1c37939 100644
--- a/lib/puppet/type/package.rb
+++ b/lib/puppet/type/package.rb
@@ -228,22 +228,23 @@ module Puppet
                 )
             end
             case @platform
-            when "sunos": @default = :sun
-            when "linux":
-                case Facter["distro"].value.downcase
-                when "gentoo":
-                    Puppet.notice "No support for gentoo yet"
+            when "solaris": @default = :sun
+            when "gentoo":
+                Puppet.notice "No support for gentoo yet"
+                @default = nil
+            when "debian": @default = :apt
+            when "fedora": @default = :yum
+            when "redhat": @default = :rpm
+            else
+                if Facter["kernel"] == "Linux"
+                    Puppet.warning "Defaulting to RPM for %s" %
+                        Facter["operatingsystem"].value
                     @default = nil
-                when "debian": @default = :apt
-                when "fedora": @default = :yum
-                when "redhat": @default = :rpm
                 else
-                    Puppet.warning "Using rpm as default type for %s" %
-                        Facter["distro"].value
-                    @default = :rpm
+                    Puppet.warning "No default package system for %s" %
+                        Facter["operatingsystem"].value
+                    @default = nil
                 end
-            else
-                @default = nil
             end
         end
 
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
index d8c4c6bd2..76bc8adb1 100644
--- a/lib/puppet/type/service.rb
+++ b/lib/puppet/type/service.rb
@@ -244,20 +244,21 @@ module Puppet
                 @defsvctype = nil
                 os = Facter["operatingsystem"].value
                 case os
-                when "Linux":
-                    case Facter["distro"].value
-                    when "Debian":
-                        @defsvctype = self.svctype(:debian)
-                    else
-                        @defsvctype = self.svctype(:init)
-                    end
-                when "SunOS":
+                when "Debian":
+                    @defsvctype = self.svctype(:debian)
+                when "Solaris":
                     release = Facter["operatingsystemrelease"].value
-                    if release.sub(/5\./,'').to_f < 10
+                    if release.sub(/5\./,'').to_i < 10
                         @defsvctype = self.svctype(:init)
                     else
                         @defsvctype = self.svctype(:smf)
                     end
+                else
+                    if Facter["kernel"] == "Linux"
+                        Puppet.notice "Using service type %s for %s" %
+                            ["init", Facter["operatingsystem"].value]
+                        @defsvctype = self.svctype(:init)
+                    end
                 end
 
                 unless @defsvctype