Merge pull request #18 from aschnell/openSUSE-13_1

- include only devices know to libstorage in target-map (bnc#861301)
yast · Feb 5, 2014 · b30fe12 · b30fe12
2 parents 40d21ab + 1746727
commit b30fe12
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.8
+3.0.9
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 03 12:44:35 CET 2014 - aschnell@suse.de
+
+- include only devices know to libstorage in target-map
+  (bnc#861301)
+- version 3.0.9
+
 -------------------------------------------------------------------
 Mon Nov 04 16:42:35 CET 2013 - aschnell@suse.de
 

diff --git a/src/modules/Storage.rb b/src/modules/Storage.rb
@@ -4400,6 +4400,12 @@ def GetTargetMap
         )
         Builtins.y2milestone("probing done")
 
+        # remove all devices unknown to libstorage, otherwise the target-map
+        # has containers without container-type
+        tmp.select! do |dev, disk|
+          @conts.any? { |c| c["device"] == dev }
+        end
+
         @probe_done = true
         changed = true
         Builtins.foreach(tmp) do |dev, disk|