Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edit AY settings #403

Merged
merged 3 commits into from
Jan 10, 2017
Merged

Edit AY settings #403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
683d5c0
Edit AY settings
schubi2 Jan 10, 2017
3209adb
rubocop
schubi2 Jan 10, 2017
9442a9f
fixed testcases
schubi2 Jan 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-bootloader.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jan 10 10:57:15 CET 2017 - schubi@suse.de

- AutoYaST: Do not crash while editing settings in AutoYaST
configuration module (with device_maps) (bnc#1018180)
- 3.1.163

-------------------------------------------------------------------
Tue Nov 29 09:17:26 UTC 2016 - jreidinger@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-bootloader.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-bootloader
Version: 3.1.162
Version: 3.1.163
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
5 changes: 4 additions & 1 deletion src/include/bootloader/routines/misc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ def getAnyTypeAttrib(attrib, defaultv)
# @return [Hash{String => String}] globals

def remapGlobals(globals_set)
return globals_set if !Arch.ppc && Storage.GetDefaultMountBy == :label
if Mode.config || # AutoYaST configuration mode --> no Storage available
!Arch.ppc && Storage.GetDefaultMountBy == :label
return globals_set
end

globals_set["boot_custom"] &&=
::Bootloader::UdevMapping.to_kernel_device(globals_set["boot_custom"])
Expand Down
5 changes: 3 additions & 2 deletions src/lib/bootloader/device_map.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ def disks_order
# or to label (ufo_disk)
# @return [Hash{String => String}] new device map
def remapped_hash
if !Yast::Arch.ppc
return to_hash if Yast::Storage.GetDefaultMountBy == :label
if Yast::Mode.config || # AutoYaST configuration mode --> no Storage available
!Arch.ppc && Storage.GetDefaultMountBy == :label
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here, it have to be Yast::Arch

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and also Yast::Storage as device map do not live in yast namespace

return to_hash
end

# convert device names in device map to the device names by device or label
Expand Down