Merge pull request #48 from k0da/master

Fix broken disklabel (bnc#879147)
yast · May 27, 2014 · 0f140dd · 0f140dd
2 parents 162aa32 + ee57aca
commit 0f140dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 26 18:54:23 CEST 2014 - dvaleev@suse.com
+
+- Fix broken disklabel fetch (bnc#879147)
+- 3.1.29
+
 -------------------------------------------------------------------
 Wed May 21 14:45:15 CEST 2014 - schubi@suse.de
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.28
+Version:        3.1.29
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/autoinstall/autopart.rb b/src/include/autoinstall/autopart.rb
@@ -128,8 +128,8 @@ def preprocess_partition_config(xmlflex)
       xmlflex = deep_copy(xmlflex)
       Builtins.y2debug("xml input: %1", xmlflex)
       tm = Storage.GetTargetMap
-      dlabel = xmlflex["disklabel"]
       partitioning = Builtins.maplist(xmlflex) do |d|
+        dlabel = d.fetch("disklabel", "msdos")
         Builtins.foreach(["keep_partition_id", "keep_partition_num"]) do |key|
           num = []
           nlist2 = Builtins.splitstring(Ops.get_string(d, key, ""), ",")