diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/ChangeLog | 19 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 6 | ||||
| -rw-r--r-- | perl-install/fs.pm | 11 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 24 | ||||
| -rw-r--r-- | perl-install/partition_table.pm | 2 |
6 files changed, 42 insertions, 24 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 8ee73ed1f..66912f974 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,22 @@ +2000-02-09 Pixel <pixel@mandrakesoft.com> + + * partition_table.pm (add): cdie if maximum number of partitions + handled by linux is reached + + * Xconfigurator.pm (chooseResolutionsGtk): display the graphic + card or server found + + * install_any.pm (relGetFile): for mdkinst files, take care not to + have a double '/' (see debbugs #591) + + * install_steps_interactive.pm (configureNetwork): + purpose: add ability to configure both modem and lan + clean up the behaviour + + * fs.pm (write_fstab): + purpose: sort the fstab per mount point (cuz /usr must be before /usr/local) + also: rewrite of the part writing the fstab. + 1999-12-19 Pixel <pixel@mandrakesoft.com> * install2.pm (configureX): write current fstab and conf.modules diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index fd73f0a3f..d48df057d 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -472,7 +472,11 @@ sub chooseResolutionsGtk($$;$) { }); } gtkadd($W->{window}, - gtkpack_($W->create_box_with_title(_("Choose resolution and color depth")), + gtkpack_($W->create_box_with_title(_("Choose resolution and color depth"), + "(" . ($o->{card}{type} ? + _("Graphic card: %s\n", $o->{card}{type}) : + _("XFree86 server: %s\n", $o->{card}{server})) . ")" + ), 1, gtkpack(new Gtk::HBox(0,20), $depth_combo = new Gtk::Combo, gtkpack_(new Gtk::VBox(0,0), diff --git a/perl-install/fs.pm b/perl-install/fs.pm index c3f960cd8..390221732 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -284,17 +284,14 @@ sub write_fstab($;$$) { } grep { isFat($_) && ! exists $new{"/dev/$_->{device}"} } @$fstab; - my @current = cat_("$prefix/etc/fstab"); + push @to_add, + sort { $a->[1] cmp $b->[1] } + grep { !exists $new{$_->[0]} && !exists $new{$_->[1]} } + map { [ split ] } cat_("$prefix/etc/fstab"); log::l("writing $prefix/etc/fstab"); local *F; open F, "> $prefix/etc/fstab" or die "error writing $prefix/etc/fstab"; - foreach (@current) { - my ($a, $b) = split; - #- if we find one line of fstab containing either the same device or mntpoint, do not write it - exists $new{$a} || exists $new{$b} and next; - print F $_; - } print F join(" ", @$_), "\n" foreach @to_add; } diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 1d4c324a2..b84cd3c4b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -36,8 +36,8 @@ sub relGetFile($) { local $_ = $_[0]; /\.img$/ and return "images/$_"; my $dir = m|/| ? "mdkinst" : - member($_, qw(compss compssList compssUsers depslist hdlist)) ? "base" : "RPMS"; - $_ = "Mandrake/$dir/$_"; + member($_, qw(compss compssList compssUsers depslist hdlist)) ? "/base" : "/RPMS"; + $_ = "Mandrake/$dir$_"; s/i386/i586/; $_; } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index ddafab251..2cb1e567f 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -348,26 +348,22 @@ sub afterInstallPackages($) { sub configureNetwork($) { my ($o, $first_time) = @_; local $_; - if ($o->{intf}) { - if (!$::beginner && $first_time || $::expert) { - my @l = ( - __("Keep the current IP configuration"), - __("Reconfigure network now"), - __("Do not set up networking"), - ); - $_ = $o->ask_from_list_([ _("Network Configuration") ], - _("Local networking has already been configured. Do you want to:"), - [ @l ]) || "Do not"; - } else { $_ = "Keep"; } - } elsif ($o->{modem}) { - $_ = "Dialup"; + if ($o->{intf} && $first_time) { + my @l = ( + __("Keep the current IP configuration"), + __("Reconfigure network now"), + __("Do not set up networking"), + ); + $_ = $::beginner ? "Keep" : + $o->ask_from_list_([ _("Network Configuration") ], + _("Local networking has already been configured. Do you want to:"), + [ @l ]) || "Do not"; } else { $_ = $::beginner ? "Do not" : $o->ask_from_list_([ _("Network Configuration") ], _("Do you want to configure networking for your system?"), [ __("Local LAN"), __("Dialup with modem"), __("Do not set up networking") ]); } - if (/^Dialup/) { $o->pppConfig; } elsif (/^Do not/) { diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 16c8a6b0c..518734f5a 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -531,6 +531,8 @@ The only solution is to move your primary partitions to have the hole next to th sub add($$;$$) { my ($hd, $part, $primaryOrExtended, $forceNoAdjust) = @_; + get_normal_parts($hd) >= ($hd->{device} =~ /^sd/ ? 15 : 63) and cdie "maximum number of partitions handled by linux reached"; + $part->{notFormatted} = 1; $part->{isFormatted} = 0; $part->{rootDevice} = $hd->{device}; |