Skip to content

Commit

Permalink
simple_mode: do also the regular proposal
Browse files Browse the repository at this point in the history
otherwise the bootloader cannot see "/"
  • Loading branch information
mvidner committed Jan 19, 2017
1 parent 017ecb6 commit 5aa22b4
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions src/clients/partitions_proposal.rb
Expand Up @@ -50,15 +50,6 @@ def main

if @func == "MakeProposal" && Mode.autoinst
Ops.set(@ret, "preformatted_proposal", Storage.ChangeText)
elsif @func == "MakeProposal" && @param["simple_mode"]
item = if rand > 0.5
# A standard configuration
_("Standard")
else
# A custom configuration
_("Custom")
end
@ret["label_proposal"] = [item]
elsif @func == "MakeProposal"
@force_reset = Ops.get_boolean(@param, "force_reset", false)
@language_changed = Ops.get_boolean(@param, "language_changed", false)
Expand Down Expand Up @@ -117,6 +108,18 @@ def main
)
Ops.set(@ret, "warning_level", :blocker)
end

if @param["simple_mode"]
item = if rand > 0.5
# A standard configuration
_("Standard")
else
# A custom configuration
_("Custom")
end
@ret["label_proposal"] = [item]
end

Storage.HandleProposalPackages
elsif @func == "AskUser"
@has_next = Ops.get_boolean(@param, "has_next", false)
Expand Down

0 comments on commit 5aa22b4

Please sign in to comment.