Merge pull request #197 from imobach/fix-waiting-services-sle-12-ga

Use /proc/uptime instead of system time while waiting for services restart

package/autoyast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 24 16:36:20 UTC 2016 - igonzalezsosa@suse.com
+
+- Check uptime instead of system time while waiting for systemd
+  services to be restarted (bsc#956730)
+- 3.1.69.12
+
 -------------------------------------------------------------------
 Tue Feb  2 17:32:02 CET 2016 - schubi@suse.de
 

package/autoyast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.69.11
+Version:        3.1.69.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/clients/inst_autoconfigure.rb

@@ -458,7 +458,7 @@ def wait_systemd_finished(max_wait, ser_ignore)
         max_wait,
         ser_ignore
       )
-      st_time = Builtins.time
+      st_time = uptime
       cur_time = st_time
       last_busy = st_time
       cmd = "systemctl --full list-jobs"
@@ -484,7 +484,7 @@ def wait_systemd_finished(max_wait, ser_ignore)
         Builtins.y2milestone("size ll=%1 ll:%2", cnt, ll)
         last_busy = cur_time if Ops.greater_than(cnt, 0)
         Builtins.sleep(500)
-        cur_time = Builtins.time
+        cur_time = uptime
         Builtins.y2milestone(
           "wait_systemd_finished time:%1 idle:%2",
           Ops.subtract(cur_time, st_time),
@@ -498,6 +498,15 @@ def wait_systemd_finished(max_wait, ser_ignore)
 
       nil
     end
+
+    private
+
+    # Determines the current uptime
+    #
+    # @return [Float] Current uptime in seconds
+    def uptime
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
   end
 end