summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-11-11 11:14:02 -0800
committerJesse Wolfe <jes5199@gmail.com>2010-11-11 11:23:20 -0800
commit6f1416d7a4cec92ccff64d904d5fe799b8ff9a85 (patch)
tree7163d09c170c5d96072ac1540c6f2280c642de86 /lib/puppet
parent3228a279c6df183309bfa89fb0d890360f6ff697 (diff)
downloadpuppet-6f1416d7a4cec92ccff64d904d5fe799b8ff9a85.tar.gz
puppet-6f1416d7a4cec92ccff64d904d5fe799b8ff9a85.tar.xz
puppet-6f1416d7a4cec92ccff64d904d5fe799b8ff9a85.zip
Fix #4904 Mounts shouldn't remount unless they are ensure=>mounted
After we fixed issue #2730, it is now possible to manage an fstab entry without asking puppet to try to call mount or unmount on that device. That fix failed to address the "refresh" behavior of mounts. We have changed "refresh" to only remount devices that are set to "mounted", so users can truly manage fstab entries without having puppet try to remount them. Paired-With: Paul Berry <paul@puppetlabs.com>
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/type/mount.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb
index d048c90f1..e8c6b3290 100755
--- a/lib/puppet/type/mount.rb
+++ b/lib/puppet/type/mount.rb
@@ -210,7 +210,7 @@ module Puppet
def refresh
# Only remount if we're supposed to be mounted.
- provider.remount if self.should(:fstype) != "swap" and provider.mounted?
+ provider.remount if self.should(:fstype) != "swap" and self.should(:ensure) == :mounted
end
def value(name)