From ee57aca1e1b624d86c80f77b20a06659bbef6a13 Mon Sep 17 00:00:00 2001 From: Dinar Valeev Date: Mon, 26 May 2014 18:56:14 +0200 Subject: [PATCH] Fix broken disklabel (bnc#879147) Signed-off-by: Dinar Valeev --- package/autoyast2.changes | 6 ++++++ package/autoyast2.spec | 2 +- src/include/autoinstall/autopart.rb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/autoyast2.changes b/package/autoyast2.changes index 2ff43dc25..1a8bc23b6 100644 --- 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 index 25db4d3f3..fd3aff2ca 100644 --- 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 index 937af0ead..dcc7e1225 100644 --- 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, ""), ",")