Merge pull request #333 from yast/extended_fix

fix extended typo (thanks mvidner)
yast · May 11, 2016 · c289448 · c289448
2 parents ad91967 + 93ffb62
commit c289448
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 11 11:03:09 UTC 2016 - jreidinger@suse.com
+
+- do not crash when stage1 is set to extended partition (thanks to
+  mvidner for catch, also fix bnc#978284)
+- 3.1.182
+
 -------------------------------------------------------------------
 Tue May 10 15:10:43 UTC 2016 - jreidinger@suse.com
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.181
+Version:        3.1.182
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/bootloader/stage1.rb b/src/lib/bootloader/stage1.rb
@@ -342,7 +342,7 @@ def assign_bootloader_device(selected_location)
       case selected_location
       when :root then add_udev_device(Yast::BootStorage.RootPartitionDevice)
       when :boot then add_udev_device(Yast::BootStorage.BootPartitionDevice)
-      when :extended then add_udev_device(extended)
+      when :extended then add_udev_device(extended_partition)
       when :mbr then add_udev_device(Yast::BootStorage.mbr_disk)
       when :none then log.info "Resetting bootloader device"
       when Array