Replace proc_uptime agent by Process.clock_gettime

yast · Mar 8, 2016 · 24af38b · 24af38b
1 parent cf43834
commit 24af38b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 43 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,8 +1,8 @@
 -------------------------------------------------------------------
 Wed Feb 24 16:36:20 UTC 2016 - igonzalezsosa@suse.com
 
-- Check /proc/uptime instead of system time while waiting for
-  systemd services to be restarted (bsc#956730)
+- Check uptime instead of system time while waiting for systemd
+  services to be restarted (bsc#956730)
 - 3.1.69.12
 
 -------------------------------------------------------------------

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -214,7 +214,6 @@ rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
 %dir %{yast_scrconfdir}
 %{yast_scrconfdir}/autoinstall.scr
 %{yast_scrconfdir}/cfg_autoinstall.scr
-%{yast_scrconfdir}/proc_uptime.scr
 # DTD files
 %dir /usr/share/autoinstall
 #%dir /usr/share/autoinstall/dtd

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -77,8 +77,7 @@ ylib_DATA = \
 scrconf_DATA = \
   scrconf/cfg_autoinstall.scr \
   scrconf/autoinstall.scr \
-  scrconf/ksimport.scr \
-  scrconf/proc_uptime.scr
+  scrconf/ksimport.scr
 
 agent_SCRIPTS = \
   servers_non_y2/ag_ksimport

diff --git a/src/clients/inst_autoconfigure.rb b/src/clients/inst_autoconfigure.rb
@@ -501,10 +501,11 @@ def wait_systemd_finished(max_wait, ser_ignore)
 
     private
 
+    # Determines the current uptime
+    #
+    # @return [Float] Current uptime
     def uptime
-      proc_uptime = SCR.Read(path(".proc.uptime"))
-      raise "Could not determine system's uptime" unless proc_uptime && proc_uptime["uptime"]
-      proc_uptime["uptime"]
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
   end
 end

diff --git a/src/scrconf/proc_uptime.scr b/src/scrconf/proc_uptime.scr