summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-02-28 02:45:57 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-02-28 02:45:57 +1100
commit86b01bf61b143e03647f5983cbc99beae8744704 (patch)
tree5137cac02aa408daef1a9e1f0367d5bd8b2e8ec2
parent91d8cb759baca3322bc5807a87a199f0aef82c6f (diff)
downloadfacter-86b01bf61b143e03647f5983cbc99beae8744704.tar.gz
facter-86b01bf61b143e03647f5983cbc99beae8744704.tar.xz
facter-86b01bf61b143e03647f5983cbc99beae8744704.zip
Fixed #2032 - file.open hanging on /proc/uptime on some platform
-rw-r--r--CHANGELOG3
-rw-r--r--lib/facter/util/uptime.rb3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fc0d4d7..ac03ca6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+1.5.x:
+ Fixed #2032 - file.open hanging on /proc/uptime on some platform
+
1.5.4:
Fixed #1966 - Added physicalprocessorcount fact
diff --git a/lib/facter/util/uptime.rb b/lib/facter/util/uptime.rb
index 1be3b98..ebba275 100644
--- a/lib/facter/util/uptime.rb
+++ b/lib/facter/util/uptime.rb
@@ -14,7 +14,8 @@ module Facter::Util::Uptime
end
def self.get_uptime
- uptime, idletime = File.open("/proc/uptime").gets.split(" ")
+ r = IO.popen("/bin/cat /proc/uptime")
+ uptime, idletime = r.readline.split(" ")
uptime_seconds = uptime.to_i
end