summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@rimspace.net>2011-01-31 14:00:33 -0800
committerDaniel Pittman <daniel@rimspace.net>2011-01-31 14:00:33 -0800
commit139760bfa7d79464d5ee092ff4e952138a29b760 (patch)
tree764cc04f5b598c7a181719cea0c217e14dafce33
parent2f74d83f22e05564a136c08dd0cc73dcd700f214 (diff)
downloadpuppet-139760bfa7d79464d5ee092ff4e952138a29b760.tar.gz
puppet-139760bfa7d79464d5ee092ff4e952138a29b760.tar.xz
puppet-139760bfa7d79464d5ee092ff4e952138a29b760.zip
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
-rw-r--r--lib/puppet/provider/mount.rb2
-rwxr-xr-xlib/puppet/type/mount.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/provider/mount.rb b/lib/puppet/provider/mount.rb
index 8c7b24bd4..6a7c72cdc 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 36fb553f5..da9a70bdf 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