From 86b01bf61b143e03647f5983cbc99beae8744704 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Sat, 28 Feb 2009 02:45:57 +1100 Subject: Fixed #2032 - file.open hanging on /proc/uptime on some platform --- CHANGELOG | 3 +++ lib/facter/util/uptime.rb | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 -- cgit