- do not call systemctl during installation (bnc#861571)

- 3.1.2
yast · Feb 10, 2014 · b093bc6 · b093bc6
1 parent bfecd63
commit b093bc6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
-Mon Feb 10 17:07:10 CET 2014 - jsuchome@suse.cz
+Mon Feb 10 17:13:06 CET 2014 - jsuchome@suse.cz
 
 - check for nil value of adjtime (bnc#862626)
+- do not call systemctl during installation (bnc#861571)
+- 3.1.2
 
 -------------------------------------------------------------------
 Tue Jan 21 09:16:47 UTC 2014 - jsrain@suse.cz

diff --git a/package/yast2-country.spec b/package/yast2-country.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        3.1.1
+Version:        3.1.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/timezone/src/modules/Timezone.rb b/timezone/src/modules/Timezone.rb
@@ -278,11 +278,13 @@ def Set(zone, really)
           "Set ret %1",
           SCR.Execute(path(".target.bash_output"), cmd)
         )
-        cmd = "/bin/systemctl try-restart systemd-timedated.service"
-        Builtins.y2milestone(
-          "restarting timedated service: %1",
-          SCR.Execute(path(".target.bash_output"), cmd)
-        )
+        unless Stage.initial
+          cmd = "/bin/systemctl try-restart systemd-timedated.service"
+          Builtins.y2milestone(
+            "restarting timedated service: %1",
+            SCR.Execute(path(".target.bash_output"), cmd)
+          )
+        end
         if !Arch.s390
           cmd = Ops.add("/sbin/hwclock --hctosys ", @hwclock)
           if Stage.initial && @hwclock == "--localtime"