diff options
| -rw-r--r-- | perl-install/ChangeLog | 17 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 6 | ||||
| -rw-r--r-- | perl-install/partition_table.pm | 14 | ||||
| -rw-r--r-- | perl-install/share/list | 1 | ||||
| -rw-r--r-- | rescue/list | 2 |
7 files changed, 37 insertions, 7 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 969619dc3..e2ecc7669 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,20 @@ +2000-04-24 Pixel <pixel@mandrakesoft.com> + + * install_steps_interactive.pm (setupXfree): add a yesorno + question for choosing between XF4 and XF3 in expert + + * install_steps_gtk.pm (choosePackagesTree): enlarge the tree window + + * install_any.pm (update_userkderc): make sure uid and gid are kept + + * diskdrake.pm (Create): add Extended_0x85 as a choice for expert + + * partition_table.pm (add_extended): handle a 3rd arg, + $extended_type to tell which kind of extended partition is wanted + * partition_table.pm (adjust_main_extended): in non-expert, + automatically set extended to linux-extended if there's only + linux-type partitions. + 2000-04-22 Pablo Saratxaga <pablo@madrakesoft.com> * install_steps_interactive.pm: s/Mb/MB/ as 'b' is symbol for bit diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 4e90cf6f5..cfeadf928 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -670,8 +670,10 @@ sub update_userkderc($$$) { } <INFILE>; print OUTFILE "[$cat]\n", values %tosubst if values %tosubst; #- if categorie has not been found above. + my @l = (stat $inputfile)[4, 5]; unlink $inputfile; rename $outputfile, $inputfile; + chown @l, $inputfile; } } diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 26ae19a4a..f19d42560 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -357,7 +357,7 @@ sub choosePackagesTree { 0, _("Choose the packages you want to install"), 1, gtkpack(new Gtk::HBox(0,0), createScrolledWindow($tree), - gtkadd(gtkset_usize(new Gtk::Frame(_("Info")), 150, 0), + gtkadd(gtkset_usize(new Gtk::Frame(_("Info")), 125, 0), createScrolledWindow($info_widget = new Gtk::Text), )), 0, my $l = new Gtk::HBox(0,15), diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 285f77209..bd7dc556b 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -965,6 +965,12 @@ sub setupXfree { Xconfig::getinfoFromXF86Config($o->{X}, $o->{prefix}); } } + $::xf4 = $o->ask_yesorno('', +_("DrakX will generate config files for both XFree 3.3 and XFree 4.0. +By default, the 3.3 server is used because it works on more graphic cards. + +Do you want to try XFree 4.0?")) if $::expert; + #- strange, xfs must not be started twice... #- trying to stop and restart it does nothing good too... my $xfs_started if 0; diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 167c3d435..0676dfcb4 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -308,12 +308,15 @@ sub adjust_main_extended($) { # the first is a special case, must recompute its real size my $start = round_down($l->{normal}{start} - 1, $hd->{geom}{sectors}); my $end = $l->{normal}{start} + $l->{normal}{size}; + my $only_linux = 1; foreach (map $_->{normal}, @l) { $start = min($start, $_->{start}); $end = max($end, $_->{start} + $_->{size}); + $only_linux &&= isTrueFS($_) || isSwap($_); } $l->{start} = $hd->{primary}{extended}{start} = $start; $l->{size} = $hd->{primary}{extended}{size} = $end - $start; + $hd->{primary}{extended}{type} = 0x85 if $only_linux && !$::expert; } unless (@{$hd->{extended} || []} || !$hd->{primary}{extended}) { %{$hd->{primary}{extended}} = (); #- modify the raw entry @@ -513,8 +516,9 @@ sub add_primary($$) { push @{$hd->{primary}{normal}}, $part; #- really do it } -sub add_extended($$) { - my ($hd, $part) = @_; +sub add_extended { + my ($hd, $part, $extended_type) = @_; + $extended_type =~ s/Extended_?//; my $e = $hd->{primary}{extended}; @@ -547,7 +551,7 @@ The only solution is to move your primary partitions to have the hole next to th my ($ext, $ext_size) = is_empty_array_ref($hd->{extended}) ? ($hd->{primary}, -1) : #- -1 size will be computed by adjust_main_extended (top(@{$hd->{extended}}), $part->{size}); - my %ext = ( type => 5, start => $part->{start}, size => $ext_size ); + my %ext = ( type => $extended_type || 5, start => $part->{start}, size => $ext_size ); raw_add($ext->{raw}, \%ext); $ext->{extended} = \%ext; @@ -574,11 +578,11 @@ sub add($$;$$) { my $e = $hd->{primary}{extended}; if ($primaryOrExtended eq 'Primary' || - $primaryOrExtended ne 'Extended' && is_empty_array_ref($hd->{primary}{normal})) { + $primaryOrExtended !~ /Extended/ && is_empty_array_ref($hd->{primary}{normal})) { eval { add_primary($hd, $part) }; return unless $@; } - eval { add_extended($hd, $part) } if $hd->hasExtended; #- try adding extended + eval { add_extended($hd, $part, $primaryOrExtended) } if $hd->hasExtended; #- try adding extended if ($@ || !$hd->hasExtended) { eval { add_primary($hd, $part) }; die $@ if $@; #- send the add extended error which should be better diff --git a/perl-install/share/list b/perl-install/share/list index 6300afded..5a966b940 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -100,3 +100,4 @@ /usr/lib/perl5/site_perl/5.005/ARCH-linux/auto/Gtk/Gtk.so /usr/lib/rpm/rpmrc /usr/sbin/ext2resize +/usr/sbin/rescuept diff --git a/rescue/list b/rescue/list index 17c7ddb6c..ce9de846a 100644 --- a/rescue/list +++ b/rescue/list @@ -119,4 +119,4 @@ /etc/protocols /sbin/lspci /usr/share/pci.ids -/bin/rpm
\ No newline at end of file +/bin/rpm |