summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/install_steps_interactive.pm16
2 files changed, 10 insertions, 8 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index cc6bf5c9a..d19672d3a 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -135,6 +135,8 @@ sub setupSCSI {
#------------------------------------------------------------------------------
sub selectInstallClass {
+ my ($o) = @_;
+
if ($o->{partitioning}{use_existing_root} || $o->{isUpgrade}) {
# either one root is defined (and all is ok), or we take the first one we find
my $p = fsedit::get_root_($o->{fstab}) || first(install_any::find_root_parts($o->{fstab}, $o->{prefix})) or die;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c1951a80c..ab4458997 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -130,14 +130,14 @@ sub selectInstallClass {
if (my @l = install_any::find_root_parts($o->{fstab}, $o->{prefix})) {
log::l("proposing to upgrade partitions " . join(" ", map { $_->{device} } @l));
- $p = $o->ask_from_listf(N("Install/Upgrade"),
- N("Is this an install or an upgrade?"),
- sub {
- ref $_[0] ? (@l > 1 ?
- N("Upgrade partition %s", partition_table::description($_[0])) :
- N("Upgrade")) :
- translate($_[0]);
- }, [ @l, N_("Install") ]);
+ my $p = $o->ask_from_listf(N("Install/Upgrade"),
+ N("Is this an install or an upgrade?"),
+ sub {
+ ref $_[0] ? (@l > 1 ?
+ N("Upgrade partition %s", partition_table::description($_[0])) :
+ N("Upgrade")) :
+ translate($_[0]);
+ }, [ @l, N_("Install") ]);
if (ref $p) {
log::l("choosing to upgrade partition $p->{device}");
install_any::use_root_part($o->{all_hds}, $p, $o->{prefix});