diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-08-14 15:27:30 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-08-14 15:27:30 +0000 |
| commit | 10de0d31d59fae02f101b78ee9d70a2b084db4c6 (patch) | |
| tree | 103ec711d7a86bbb4cf3f07a206c51fb70664cc8 /perl-install/install_steps_interactive.pm | |
| parent | 01a9071bd222bbe00c6fce7326eb9135fcc5d367 (diff) | |
| download | drakx-10de0d31d59fae02f101b78ee9d70a2b084db4c6.tar drakx-10de0d31d59fae02f101b78ee9d70a2b084db4c6.tar.gz drakx-10de0d31d59fae02f101b78ee9d70a2b084db4c6.tar.bz2 drakx-10de0d31d59fae02f101b78ee9d70a2b084db4c6.tar.xz drakx-10de0d31d59fae02f101b78ee9d70a2b084db4c6.zip | |
- fix createBootdisk with auto
- fix setupBootloader with auto
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 7 |
1 files changed, 3 insertions, 4 deletions
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('', |