merging with master

yast · Jan 11, 2016 · b6e7f5a · b6e7f5a
2 parents f468030 + 16f04d2
commit b6e7f5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,8 +1,14 @@
 -------------------------------------------------------------------
-Thu Dec 17 15:53:34 CET 2015 - schubi@suse.de
+Thu Dec 22 15:53:34 CET 2015 - schubi@suse.de
 
 - Removing network dependencies in the service files in order to
   prevent booting cycles in Tumbleweed. (bnc#954908)
+- 3.1.167
+
+-------------------------------------------------------------------
+Mon Dec 21 08:08:15 UTC 2015 - jsrain@suse.cz
+
+- fixed function name to check zKVM hypervisor (bsc#956736)
 - 3.1.166
 
 -------------------------------------------------------------------

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

diff --git a/src/include/installation/inst_inc_all.rb b/src/include/installation/inst_inc_all.rb
@@ -241,7 +241,7 @@ def SetDiskActivationModule
       fcoe = Linuxrc.InstallInf("WithFCoE") == "1"
       no_disk = Builtins.isempty(Storage.GetDetectedDiskPaths)
 
-      if !((Arch.s390 && !Arch.zkvm) || iscsi || fcoe || no_disk)
+      if !((Arch.s390 && !Arch.is_zkvm) || iscsi || fcoe || no_disk)
         Builtins.y2milestone("Disabling disk activation module")
         ProductControl.DisableModule("disks_activate")
       end