diff options
| author | James Turnbull <james@lovedthanlost.net> | 2009-04-06 11:45:23 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-04-06 11:45:23 +1000 |
| commit | 3aedfd8bbcefcdb92af57e4661a360be9aee2716 (patch) | |
| tree | f44e6bd75fca39f2fd6c87e5d0b6e84ee14dd8e0 /lib/puppet/util | |
| parent | 173b5f0a162d8dd7f72e1cab257069bc65382960 (diff) | |
| parent | a677e26eb1452c08d7724047a18e50f4a654d2cd (diff) | |
| download | puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.tar.gz puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.tar.xz puppet-3aedfd8bbcefcdb92af57e4661a360be9aee2716.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/selinux.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb index 70f244507..f13600680 100644 --- a/lib/puppet/util/selinux.rb +++ b/lib/puppet/util/selinux.rb @@ -153,7 +153,9 @@ module Puppet::Util::SELinux # Internal helper function to read and parse /proc/mounts def read_mounts begin - mounts = File.read("/proc/mounts") + mountfh = File.open("/proc/mounts", File::NONBLOCK) + mounts = mountfh.read + mountfh.close rescue return nil end |