diff options
| -rw-r--r-- | perl-install/install2.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index ce08f0f70..190b529ab 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -288,7 +288,7 @@ sub addUser { sub createBootdisk { my ($clicked, $ent_number, $auto) = @_; modules::write_conf($o->{prefix}); - installStepsCall($o, $auto, 'createBootdisk', $ent_number == 1); + installStepsCall($o, $auto, 'createBootdisk', $ent_number == 1, $clicked); } #------------------------------------------------------------------------------ @@ -299,7 +299,7 @@ sub setupBootloader { modules::write_conf($o->{prefix}); installStepsCall($o, $auto, 'setupBootloaderBefore') if $ent_number == 1; - installStepsCall($o, $auto, 'setupBootloader', $ent_number - 1); + installStepsCall($o, $auto, 'setupBootloader', $ent_number-1 + $clicked*2); #- gore :-( local $ENV{DRAKX_PASSWORD} = $o->{bootloader}{password}; local $ENV{DURING_INSTALL} = 1; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index ed92489ea..7f3f2daca 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -995,9 +995,9 @@ sub addUser { #------------------------------------------------------------------------------ sub createBootdisk { - my ($o, $first_time) = @_; + my ($o, $first_time, $noauto) = @_; - return if $first_time && !$::expert; + return if !$noauto && $first_time && !$::expert; if (arch() =~ /sparc/) { #- as probing floppies is a bit more different on sparc, assume always /dev/fd0. @@ -1067,8 +1067,7 @@ sub setupBootloader { log::l("OldWorld or Unknown Machine - no yaboot setup"); return; } - } - if (arch() =~ /^alpha/) { + } elsif (arch() =~ /^alpha/) { $o->ask_yesorno('', _("Do you want to use aboot?"), 1) or return; catch_cdie { $o->SUPER::setupBootloader } sub { $o->ask_yesorno('', |