diff options
| -rw-r--r-- | perl-install/ChangeLog | 12 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 8 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/partition_table_raw.pm | 1 |
5 files changed, 22 insertions, 8 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index f8c396e61..a83b2ff26 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,17 @@ 2000-09-18 Pixel <pixel@mandrakesoft.com> + * install_steps_interactive.pm (choosePartitionsToFormat): nicer + partition/device display + + * partition_table_raw.pm (zero_MBR): add on the fly require of the + good partition_table_$type + + * detect_devices.pm (cdroms): fix (yet again) the scd$nb device + assignment to ide burners + + * install_steps.pm (afterInstallPackages): comment out a part of + the icons mess messing + * Xconfigurator.pm (cardConfiguration): move Unlisted to Other/Unlisted * share/CardsNames: updated (for Voodoo5) diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 319975db3..d62999b4b 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -45,11 +45,12 @@ sub cdroms() { my @l = grep { $_->{type} eq 'cdrom' } get(); if (my @l2 = getIDEBurners()) { require modules; - my $nb = first(modules::add_alias('scsi_hostadapter', 'ide-scsi') =~ /(\d*)/) + 1; + modules::add_alias('scsi_hostadapter', 'ide-scsi'); + my $nb = 1 + max(-1, map { $_->{device} =~ /scd(\d+)/ } @l); foreach my $b (@l2) { log::l("getIDEBurners: $b"); my ($e) = grep { $_->{device} eq $b } @l or next; - $e->{device} = "scd" . ($nb++ || 0); + $e->{device} = "scd" . $nb++; } } @l; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 352d0b6a0..ef6ce2e6d 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -432,10 +432,10 @@ Consoles 1,3,4,7 may also contain interesting information"; substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec; } - #- update language and icons for KDE. - update_userkderc($o->{prefix}, 'Locale', Language => ""); - log::l("updating kde icons according to available devices"); - install_any::kdeicons_postinstall($o->{prefix}); +# #- update language and icons for KDE. +# update_userkderc($o->{prefix}, 'Locale', Language => ""); +# log::l("updating kde icons according to available devices"); +# install_any::kdeicons_postinstall($o->{prefix}); my $welcome = _("Welcome to %s", "HOSTNAME"); substInFile { s/^(GreetString)=.*/$1=$welcome/ } "$o->{prefix}/usr/share/config/kdmrc"; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 85e0c1b1c..0093a1441 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -67,7 +67,7 @@ translated etc. that varies from language to language).") if $o->{lang} !~ /^en/ $o->{useless_thing_accepted} = $o->ask_from_list_('', "License - no warranty", - [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or _exit(1) unless $o->{useless_thing_accepted}; + [ __("Accept"), __("Refuse") ], "Accept") eq "Accept" or $o->exit unless $o->{useless_thing_accepted}; } #------------------------------------------------------------------------------ sub selectKeyboard($) { @@ -286,7 +286,7 @@ sub choosePartitionsToFormat($$) { isSwap($_) ? type2name($_->{type}) : $_->{mntpoint}, isLoopback($_) ? $::expert && loopback::file($_) : - "(" . partition_table_raw::description($_) . ")") foreach @l; + partition_table_raw::description($_)) foreach @l; $o->ask_many_from_list_ref('', _("Choose the partitions you want to format"), [ map { $label{$_} } @l ], diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm index 131b34688..aae6f843c 100644 --- a/perl-install/partition_table_raw.pm +++ b/perl-install/partition_table_raw.pm @@ -120,6 +120,7 @@ sub zero_MBR { my ($hd) = @_; #- force the standard partition type for the architecture my $type = arch() eq "alpha" ? "bsd" : arch() =~ /^sparc/ ? "sun" : arch() eq "ppc" ? "mac" : "dos"; + require("partition_table_$type.pm"); bless $hd, "partition_table_$type"; $hd->{primary} = $hd->clear_raw(); delete $hd->{extended}; |