Fixing #892 -- filesystem mounts are no longer remounted.

3 files changed, 10 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 430e0c38e..04fb18791 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+    Mounts no longer remount swap filesystems.
+
     Slightly modifying how services manage their list of paths
     (and adding documention for it).  Services now default
     to the paths specified by the provider classes.
diff --git a/lib/puppet/type/mount.rb b/lib/puppet/type/mount.rb
index 7ba411452..ca8e27e17 100755
--- a/lib/puppet/type/mount.rb
+++ b/lib/puppet/type/mount.rb
@@ -195,7 +195,7 @@ module Puppet
 
         def refresh
             # Only remount if we're supposed to be mounted.
-            provider.remount if provider.mounted?
+            provider.remount if self.should(:fstype) != "swap" and provider.mounted?
         end
 
         def value(name)
diff --git a/spec/unit/ral/types/mount.rb b/spec/unit/ral/types/mount.rb
index c50f671fd..0c4b94177 100755
--- a/spec/unit/ral/types/mount.rb
+++ b/spec/unit/ral/types/mount.rb
@@ -185,4 +185,11 @@ describe Puppet::Type::Mount, "when responding to events" do
 
         @mount.refresh
     end
+
+    it "should not remount swap filesystems" do
+        @mount[:fstype] = "swap"
+        @provider.expects(:remount).never
+
+        @mount.refresh
+    end
 end