Merge pull request #146 from imobach/fix-boot-type-sle12

Fix special /boot handling on SLE12
yast · Aug 7, 2015 · 1cbeb83 · 1cbeb83
2 parents aaaee7c + 29b5c41
commit 1cbeb83
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug  7 07:41:05 UTC 2015 - igonzalezsosa@suse.com
+
+- Fix special /boot handling on custom partitioning (bsc#940374)
+
 -------------------------------------------------------------------
 Thu Sep 18 16:34:43 CEST 2014 - aschnell@suse.de
 

diff --git a/src/include/partitioning/ep-main.rb b/src/include/partitioning/ep-main.rb
@@ -733,6 +733,12 @@ def ExpertPartitioner
           Storage.SetPartMode("CUSTOM") if Storage.GetPartMode == "NORMAL"
         when :next
           if !Storage.EqualBackupStates("expert-partitioner", "", true)
+            # Handle boot partition (bsc#940374) during installation
+            if Stage.initial && !Mode.repair
+              new_tgmap = Storage.SpecialBootHandling(Storage.GetTargetMap())
+              Storage.SetTargetMap(new_tgmap)
+            end
+
             Storage.SetPartMode("CUSTOM")
             Storage.UpdateChangeTime
           end