Merge pull request #136 from aschnell/master

- fixed DASD detection (bnc#860398)
yast · Jan 30, 2014 · a6a5883 · a6a5883
2 parents 981b7d8 + c3a5a29
commit a6a5883
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 30 15:42:52 CET 2014 - aschnell@suse.de
+
+- fixed DASD detection (bnc#860398)
+- 3.1.26
+
 -------------------------------------------------------------------
 Tue Jan 28 15:37:15 UTC 2014 - jreidinger@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-installation
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.25
+Version:        3.1.26
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_disks_activate.rb b/src/clients/inst_disks_activate.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # ------------------------------------------------------------------------------
-# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+# Copyright (c) [2006-2014] Novell, Inc. All Rights Reserved.
 #
 #
 # This program is free software; you can redistribute it and/or modify it under
@@ -61,7 +61,7 @@ def main
 
         # detect DASD disks
         disks = SCR.Read(path(".probe.disk"))
-        @have_dasd = disks.any? {|d| d["device"] == "dasd" }
+        @have_dasd = disks.any? {|d| d["device"] == "DASD" }
 
         # detect zFCP disks
         controllers = SCR.Read(path(".probe.storage"))