Merge remote-tracking branch 'upstream/SLE-12-GA' into fix-install-ru…

…les-sle-12-ga

* upstream/SLE-12-GA:
  Minor improvement to inst_autoconfigure documentation
  Replace proc_uptime agent by Process.clock_gettime
  Bump version and update changes file
  Raises an exception if uptime could not be determined
  Check /proc/uptime while waiting for systemd services to restart
  Installation with autoyast=default. Fixed nil exception error.

package/autoyast2.changes

@@ -1,17 +1,31 @@
 -------------------------------------------------------------------
-Tue Jan 26 14:44:08 UTC 2016 - igonzalezsosa@suse.com
+Thu Mar 10 08:33:33 UTC 2016 - igonzalezsosa@suse.com
 
 - Evaluate the correct domain, network, product and product version
   when applying rules (bnc#963137).
-- 3.1.69.11
+- 3.1.69.13
 
 -------------------------------------------------------------------
-Tue Jan 26 09:25:54 UTC 2016 - schubi@suse.de
+Thu Mar 10 08:33:33 UTC 2016 - schubi@suse.de
 
 - Evaluate the correct host IP in order to read the proper
   autoyast.xml file (bnc#928303, bnc#908356, bnc#916628,
   part of bnc#963137).
 
+-------------------------------------------------------------------
+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
+
+- Installation with "autoyast=default". Fixed nil exception error.
+  (bnc#959723)
+- 3.1.69.11
+
 -------------------------------------------------------------------
 Fri Nov 13 11:08:27 UTC 2015 - igonzalezsosa@suse.com
 

package/autoyast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.69.11
+Version:        3.1.69.13
 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
 

src/include/autoinstall/io.rb

@@ -181,7 +181,8 @@ def Get(_Scheme, _Host, _Path, _Localfile)
           # The Cdrom entry in install.inf is obsolete. So we are using the
           # entry which is defined in InstUrl module. (bnc#908271)
           install_url = InstURL.installInf2Url("")
-          cdrom_device = install_url ? Builtins.regexpsub(install_url, "devices=(.*)$", "\\1") : ""
+          # Builtins.regexpsub can also return nil (bnc#959723)
+          cdrom_device = install_url ? (Builtins.regexpsub(install_url, "devices=(.*)$", "\\1") || "") : ""
           if Installation.boot == "cd" && !cdrom_device.empty?
             already_mounted = Ops.add(
               Ops.add("grep ", cdrom_device),