[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5rc1-120-g2247c80

[Daniel Pittman]

The following commit has been merged in the upstream branch:
commit 139760bfa7d79464d5ee092ff4e952138a29b760
Author: Daniel Pittman <daniel at rimspace.net>
Date:   Mon Jan 31 14:00:33 2011 -0800

    Bug #5681 -- parse AIX mount command output.
    
    - Modified the Puppet::Provider::Mount (lib/puppet/provider/mount.rb) to parse
      AIX mount command output
    - Modified lib/puppet/type/mount.rb to set remount to false by default in AIX
      and fix small typo

diff --git a/lib/puppet/provider/mount.rb b/lib/puppet/provider/mount.rb
index 8c7b24b..6a7c72c 100644
--- a/lib/puppet/provider/mount.rb
+++ b/lib/puppet/provider/mount.rb
@@ -43,6 +43,8 @@ module Puppet::Provider::Mount
         line =~ / on #{name} / or line =~ %r{ on /private/var/automount#{name}}
       when "Solaris", "HP-UX"
         line =~ /^#{name} on /
+      when "AIX"
+        line =~ /^[^\s]*\s+[^\s]+\s+#{name}\s/
       else
         line =~ / on #{name} /
       end
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb
index 36fb553..da9a70b 100755
--- a/lib/puppet/type/mount.rb
+++ b/lib/puppet/type/mount.rb
@@ -200,7 +200,7 @@ module Puppet
       newvalues(:true, :false)
       defaultto do
         case Facter.value(:operatingsystem)
-        when "FreeBSD", "Darwin"
+        when "FreeBSD", "Darwin", "AIX"
           false
         else
           true

-- 
Puppet packaging for Debian