X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fmounts.rb;h=2a075ccba0d2a132e81459530ce9601f77f171aa;hb=d58296c3170f2a07cd92f126d46e3e83be037033;hp=c1c6aabaf8ed0795b0ed61e4667c5e7ada2ce53a;hpb=16585b6e58da75d74b213b22309d03fabba9b05c;p=mirror%2Fdsa-puppet.git

diff --git a/facts/mounts.rb b/facts/mounts.rb
index c1c6aabaf..2a075ccba 100644
--- a/facts/mounts.rb
+++ b/facts/mounts.rb
@@ -1,17 +1,21 @@
-require 'filesystem'
+begin
+  require 'filesystem'
 
-Facter.add("mounts") do
-	ignorefs = ["NFS", "nfs", "nfs4", "afs", "binfmt_misc", "proc", "smbfs", 
-		    "autofs", "iso9660", "ncpfs", "coda", "devpts", "ftpfs", "devfs", 
-		    "mfs", "shfs", "sysfs", "cifs", "lustre_lite", "tmpfs", "usbfs", "udf"]
-	mountpoints = []
-	FileSystem.mounts.each do |m|
-		if not ignorefs.include?(m.fstype) && m.options !~ /bind/
-			mountpoints << m.mount
+	Facter.add("mounts") do
+		ignorefs = ["NFS", "nfs", "nfs4", "nfsd", "afs", "binfmt_misc", "proc", "smbfs", 
+			    "autofs", "iso9660", "ncpfs", "coda", "devpts", "ftpfs", "devfs", 
+			    "mfs", "shfs", "sysfs", "cifs", "lustre_lite", "tmpfs", "usbfs", "udf",
+			    "fusectl", "fuse.snapshotfs", "rpc_pipefs"]
+		mountpoints = []
+		FileSystem.mounts.each do |m|
+			if ((not ignorefs.include?(m.fstype)) && (m.options !~ /bind/))
+				mountpoints << m.mount
+			end
+		end
+		setcode do
+			mountpoints.join(',')
 		end
 	end
-	setcode do
-		mountpoints.join(',')
-	end
-end
 
+rescue Exception => e
+end