X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=facts%2Fmounts.rb;h=2a075ccba0d2a132e81459530ce9601f77f171aa;hb=3ce119f19443e40db3f4570473938c0de059ac85;hp=b6494bf20272023cbac06c796cf77a0b1e5061ed;hpb=6c0e762ea3621bcb1b3ac4173b06b3e0bb5b6a11;p=mirror%2Fdsa-puppet.git diff --git a/facts/mounts.rb b/facts/mounts.rb index b6494bf20..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