X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fmounts.rb;h=2a075ccba0d2a132e81459530ce9601f77f171aa;hb=b6577bf29c47fd9dff8f40aceb200a3f4431dc1a;hp=5f3d3c12ec22ef4c25f45f540880b2419a229812;hpb=2607f8c0ccfc852cb4d3335e5715621729f89152;p=mirror%2Fdsa-puppet.git diff --git a/facts/mounts.rb b/facts/mounts.rb index 5f3d3c12e..2a075ccba 100644 --- a/facts/mounts.rb +++ b/facts/mounts.rb @@ -1,21 +1,21 @@ begin require 'filesystem' -rescue Exception => e - exit 0 -end -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