Merge pull request #127 from k0da/bsc922431

fix have_ppc_boot to check GPT PReP partitions
yast · Mar 16, 2015 · 7e7d49e · 7e7d49e
2 parents b0ac35b + 6aee44d
commit 7e7d49e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.152
+2.17.153
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,3 +1,8 @@
+Mon Mar 16 13:13:38 CET 2015 - dvaleev@suse.com
+
+- check for GPT PReP in have_ppc_boot (bsc#922431)
+- 2.17.153
+
 -------------------------------------------------------------------
 Wed Mar 04 14:55:21 CET 2015 - dvaleev@suse.com
 

diff --git a/storage/src/modules/Storage.ycp b/storage/src/modules/Storage.ycp
@@ -5506,7 +5506,8 @@ global define map<string,map> SpecialBootHandling( map<string,map> tg )
 	foreach(map part, disk["partitions"]:[],
 	    ``{
 	    if( !have_ppc_boot &&
-	        part["fsid"]:0 == Partitions::fsid_prep_chrp_boot &&
+	        (part["fsid"]:0 == Partitions::fsid_prep_chrp_boot ||
+	        part["fsid"]:0 == Partitions::fsid_gpt_prep) &&
 		size(part["mount"]:"")==0 && part["create"]:false )
 		{
 		have_ppc_boot = true;