diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-18 15:32:26 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-18 15:32:26 -0800 |
| commit | 85e3174c060bc3bcde352872c83c7183b296b011 (patch) | |
| tree | c29211b6d24268bcb6172ea76df5b2694cb50601 | |
| parent | 9e0f9c5cfecf4ff81724c048c5afe5a288fcc9b2 (diff) | |
| parent | 960890f6ac6bcf1d639c68d4fe807ac54bf3a1ba (diff) | |
| download | puppet-85e3174c060bc3bcde352872c83c7183b296b011.tar.gz | |
Merge branch 'tickets/2.6.x/6364-fix-mount-provider-on-aix' into 2.6.x
* tickets/2.6.x/6364-fix-mount-provider-on-aix:
(#6364) Adjust mis-translated regex in mount provider for AIX
| -rw-r--r-- | lib/puppet/provider/mount.rb | 2 | ||||
| -rw-r--r-- | spec/fixtures/unit/provider/mount/mount-output.aix.txt | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/puppet/provider/mount.rb b/lib/puppet/provider/mount.rb index c979f742f..354ddb16d 100644 --- a/lib/puppet/provider/mount.rb +++ b/lib/puppet/provider/mount.rb @@ -44,7 +44,7 @@ module Puppet::Provider::Mount when "Solaris", "HP-UX" line =~ /^#{name} on / when "AIX" - line.split(/\s+/)[1] == name + line.split(/\s+/)[2] == name else line =~ / on #{name} / end diff --git a/spec/fixtures/unit/provider/mount/mount-output.aix.txt b/spec/fixtures/unit/provider/mount/mount-output.aix.txt index 54edb9c1c..380dbc5ae 100644 --- a/spec/fixtures/unit/provider/mount/mount-output.aix.txt +++ b/spec/fixtures/unit/provider/mount/mount-output.aix.txt @@ -1,7 +1,7 @@ -/dev/hd4 / jfs2 Nov 11 12:11 rw,log=/dev/hd8 -/dev/hd2 /usr jfs2 Nov 11 12:11 rw,log=/dev/hd8 -/dev/hd9var /var jfs2 Nov 11 12:11 rw,log=/dev/hd8 -/dev/hd3 /tmp jfs2 Nov 11 12:11 rw,log=/dev/hd8 -/dev/hd1 /home jfs2 Nov 11 12:11 rw,log=/dev/hd8 -/proc /proc procfs Nov 11 12:11 rw -/dev/hd10opt /opt jfs2 Nov 11 12:11 rw,log=/dev/hd8 +node mounted mounted over vfs date options +---- ------- ------------ --- ------------ ------------------- + /dev/hd0 / jfs Dec 17 08:04 rw, log =/dev/hd8 + /dev/hd3 /tmp jfs Dec 17 08:04 rw, log =/dev/hd8 + /dev/hd1 /home jfs Dec 17 08:06 rw, log =/dev/hd8 + /dev/hd2 /usr jfs Dec 17 08:06 rw, log =/dev/hd8 +sue /home/local/src /usr/code nfs Dec 17 08:06 ro, log =/dev/hd8 |