Merge SLE-12-GA branch into SP1

yast · Mar 8, 2016 · a0f0ec2 · a0f0ec2
2 parents faf6f31 + b4fe206
commit a0f0ec2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+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.101.14
+
+-------------------------------------------------------------------
+
 Wed Jan 20 16:31:03 CET 2016 - schubi@suse.de
 
 - LVM: taking care about "auto" option --> switching to "max".

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.101.13
+Version:        3.1.101.14
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_autoconfigure.rb b/src/clients/inst_autoconfigure.rb
@@ -500,7 +500,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"
@@ -526,7 +526,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),
@@ -540,6 +540,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