diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-25 12:05:57 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-25 12:05:57 +0000 |
| commit | abe9015866eff5909b8242ef944f73de11bc4285 (patch) | |
| tree | ce2777a3957ef1aa68562e066e9fe8f6193f9873 | |
| parent | bba44c0f1c837d63f51872410feb0b6266c5be47 (diff) | |
| download | drakx-backup-do-not-use-abe9015866eff5909b8242ef944f73de11bc4285.tar drakx-backup-do-not-use-abe9015866eff5909b8242ef944f73de11bc4285.tar.gz drakx-backup-do-not-use-abe9015866eff5909b8242ef944f73de11bc4285.tar.bz2 drakx-backup-do-not-use-abe9015866eff5909b8242ef944f73de11bc4285.tar.xz drakx-backup-do-not-use-abe9015866eff5909b8242ef944f73de11bc4285.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/ChangeLog | 4 | ||||
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 9fe9eb570..f8aaacc0f 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -6,8 +6,10 @@ * install2.pm: removed create boot disk and create auto install disk on sparc*. force writing of /etc/conf.modules for step setupBootloader. * install_steps_interactive.pm: added missing $prefix for glob_. call - configure_entry in setupSILO. + configure_entry in setupSILO. fixed cancel or None entry on setupBootloader. * modules.pm: updated alias for sparc*. + * any.pm: fixed proprable wrong test for setupBootloader in beginner at + the very beginning. 2000-05-24 François Pons <fpons@mandrakesoft.com> diff --git a/perl-install/any.pm b/perl-install/any.pm index 2afc3b251..120f1a387 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -56,7 +56,7 @@ sub setupBootloader { $more++ if $b->{bootUnsafe}; - if ($::beginner && $more == 1) { + if ($::beginner && $more >= 1) { my @l = (__("First sector of drive (MBR)"), __("First sector of boot partition")); $in->set_help('setupBootloaderBeginner') unless $::isStandalone; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index eac2a20f9..fbc26734b 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -777,7 +777,7 @@ failures. Would you like to create a bootdisk for your system?"), #------------------------------------------------------------------------------ sub setupLILO { my ($o, $more) = @_; - any::setupBootloader($o, $o->{bootloader}, $o->{hds}, $o->{fstab}, $o->{security}, $o->{prefix}, $more) unless $o->{lnx4win}; + $o->{lnx4win} or any::setupBootloader($o, $o->{bootloader}, $o->{hds}, $o->{fstab}, $o->{security}, $o->{prefix}, $more) or return; eval { $o->SUPER::setupBootloader }; if ($@) { |