diff options
| -rw-r--r-- | perl-install/ChangeLog | 13 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index f719772cf..e1f6087ee 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,7 +1,20 @@ +2000-09-20 Pixel <pixel@mandrakesoft.com> + + * Xconfigurator.pm (testFinalConfig): check if "server" OR + "driver" field is set (otherwise XF4 only card won't pass) + + * bootloader.pm (suggest): fix for ``installing the last cooker + from kenobi:/I on an smp machine i don't get anymore an entry for + linux-up'' (c chmouel) + 2000-09-20 dam's <damien@mandrakesoft.com> * netconnect.pm (read_isdn_providers): corrected typo ($_ -> $_[0]) +2000-09-20 DrakX <install@linux-mandrake.com> + + * snapshot uploaded + 2000-09-19 Pixel <pixel@mandrakesoft.com> * modules.pm (get_pcmcia_devices): fix (especially, now ethernet diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index c145a7569..42cdad9d2 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -391,7 +391,7 @@ sub testFinalConfig { $o->{monitor}{hsyncrange} && $o->{monitor}{vsyncrange} or $in->ask_warn('', _("Monitor not configured")), return; - $o->{card}{server} or + $o->{card}{server} || $o->{card}{driver} or $in->ask_warn('', _("Graphic card not configured yet")), return; $o->{card}{depth} or diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index c2516626e..26443ee63 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -259,7 +259,7 @@ wait %d seconds for default boot. { label => $isSecure || $isSMP ? 'linux-up' : 'linux-nonfb', root => "/dev/$root", - }) if !$isSecure && !$isSMP && $vga_fb; + }) if $isSecure || $isSMP || $vga_fb; add_kernel($prefix, $lilo, $kernelVersion, '', { label => 'failsafe', |