diff options
| -rw-r--r-- | perl-install/ChangeLog | 25 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 10 |
5 files changed, 37 insertions, 9 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 11c8225bf..f8c396e61 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,28 @@ +2000-09-18 Pixel <pixel@mandrakesoft.com> + + * Xconfigurator.pm (cardConfiguration): move Unlisted to + Other/Unlisted + * share/CardsNames: updated (for Voodoo5) + + * install_steps_gtk.pm (selectMouse): fix the test to know wether + the guy has changed the mouse type (to know wether to test the + mouse or not) + + * install_steps_interactive.pm (selectLanguage): add the license + + * install_steps_interactive.pm (choosePackages): have the + "Recommended" size be the default + (in the choice Minimum/Recommanded/Complete) + + * diskdrake.pm (Type): fix a typo + + * install_steps.pm (doPartitionDisksAfter): mark partition as + mounted + +2000-09-17 DrakX <install@linux-mandrake.com> + + * snapshot uploaded + 2000-09-17 Pixel <pixel@mandrakesoft.com> * install/pcmcia_config.patch: cleaned diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 7421f53f6..9c3fd8e64 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -176,8 +176,8 @@ sub cardConfiguration(;$$$) { undef $card->{type} unless $card->{server}; #- bad type as we can't find the server add2hash($card, cardConfigurationAuto()) unless $card->{server} || $noauto; $card->{server} = 'FBDev' unless !$allowFB || $card->{server} || $card->{type} || $noauto; - $card->{type} = cardName2RealName($in->ask_from_treelist(_("Graphic card"), _("Select a graphic card"), '|', ['Unlisted', readCardsNames()])) unless $card->{type} || $card->{server}; - undef $card->{type}, $card->{server} = $in->ask_from_list(_("X server"), _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq "Unlisted"; + $card->{type} = cardName2RealName($in->ask_from_treelist(_("Graphic card"), _("Select a graphic card"), '|', ['Other|Unlisted', readCardsNames()])) unless $card->{type} || $card->{server}; + undef $card->{type}, $card->{server} = $in->ask_from_list(_("X server"), _("Choose a X server"), $allowFB ? \@allservers : \@allbutfbservers ) if $card->{type} eq 'Other|Unlisted'; updateCardAccordingName($card, $card->{type}) if $card->{type}; add2hash($card, { vendor => "Unknown", board => "Unknown" }); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 300a06ecb..352d0b6a0 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -151,7 +151,10 @@ sub doPartitionDisksAfter { my ($part) = grep { $_->{device} eq $s->{device} } @{$o->{fstab}}; $part->{isMounted} ? do { rmdir "/tmp/hdimage" ; symlinkf("$o->{prefix}$part->{mntpoint}", "/tmp/hdimage") } : - eval { fs::mount($s->{device}, "/tmp/hdimage", $s->{type}) }; + eval { + fs::mount($s->{device}, "/tmp/hdimage", $s->{type}); + $part->{isMounted} = 1; + }; } cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/rhimage nfs| && diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 6e36560c9..4562bc127 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -177,7 +177,7 @@ sub selectMouse { my %old = %{$o->{mouse}}; $o->SUPER::selectMouse($force); - $old{FULLNAME} eq $o->{mouse}{FULLNAME} && !$force and return; + $old{type} eq $o->{mouse}{type} && $old{name} eq $o->{mouse}{name} && !$force and return; local $my_gtk::grab = 1; #- unsure a crazy mouse don't go wild clicking everywhere diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 5b4930a91..85e0c1b1c 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -64,10 +64,10 @@ listed means there is some support for it anyway. That is, once GNU/Linux will be installed, you will be able to at least read and write in that language; and possibly more (various fonts, spell checkers, various programs translated etc. that varies from language to language).") if $o->{lang} !~ /^en/ && translate("_I18N_"); - -#- $o->{useless_thing_accepted} = $o->ask_from_list_('', -#-"Warning no warranty", -#- [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or _exit(1) unless $o->{useless_thing_accepted}; + + $o->{useless_thing_accepted} = $o->ask_from_list_('', + "License - no warranty", + [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or _exit(1) unless $o->{useless_thing_accepted}; } #------------------------------------------------------------------------------ sub selectKeyboard($) { @@ -355,7 +355,7 @@ sub choosePackages { $l[2] > $l[1] + 200 or splice(@l, 1, 1); #- not worth proposing too alike stuff $l[1] > $l[0] + 100 or splice(@l, 0, 1); my @text = (__("Minimum (%dMB)"), __("Recommended (%dMB)"), __("Complete (%dMB)")); - $o->ask_from_listf('', _("Select the size you want to install"), sub { _ ($text[$_[1]], $_[0]) }, \@l) * sqr(1024); + $o->ask_from_listf('', _("Select the size you want to install"), sub { _ ($text[$_[1]], $_[0]) }, \@l, $l[1]) * sqr(1024); } else { $o->chooseSizeToInstall($packages, $min_size, $max_size, $availableC, $individual) || goto &choosePackages; } |