From 10de0d31d59fae02f101b78ee9d70a2b084db4c6 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Tue, 14 Aug 2001 15:27:30 +0000 Subject: - fix createBootdisk with auto - fix setupBootloader with auto --- perl-install/install_steps_interactive.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'perl-install/install_steps_interactive.pm') 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('', -- cgit v1.2.1