diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-01-31 14:06:10 -0800 |
|---|---|---|
| committer | Daniel Pittman <daniel@rimspace.net> | 2011-01-31 14:06:10 -0800 |
| commit | 5bba59a7126e150e0e1e671d331878f4a00e2b2b (patch) | |
| tree | 064ed0038211e0e4b15feb593bc43325a36cab54 /lib | |
| parent | 8de9b9aeadcee490065aeb34663ca22c513fd2e4 (diff) | |
| parent | 50c12e55b6f8462f6904ae061e661d1d10c7590a (diff) | |
| download | puppet-5bba59a7126e150e0e1e671d331878f4a00e2b2b.tar.gz puppet-5bba59a7126e150e0e1e671d331878f4a00e2b2b.tar.xz puppet-5bba59a7126e150e0e1e671d331878f4a00e2b2b.zip | |
Merge branch 'bug/2.6.next/5681-aix-mount-output' into 2.6.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/mount.rb | 2 | ||||
| -rwxr-xr-x | lib/puppet/type/mount.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/provider/mount.rb b/lib/puppet/provider/mount.rb index 8c7b24bd4..c979f742f 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.split(/\s+/)[1] == name 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 |