summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-14 16:42:45 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-14 16:42:45 +0000
commitea1c93402dfa2aba19ab3dbc3551cd21572affb9 (patch)
treeec45ca3dd1f9c2899748fabe19ef9f4a2d1ba13d /perl-install/install_steps_gtk.pm
parent0f4c7b1bab30307ecee99c03506b0bb632e5c51f (diff)
downloaddrakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar
drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.gz
drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.bz2
drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.tar.xz
drakx-ea1c93402dfa2aba19ab3dbc3551cd21572affb9.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r--perl-install/install_steps_gtk.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 460835d18..38ef48745 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -254,12 +254,15 @@ sub doPartitionDisks($$) {
my $w = $o->wait_message(_("Resizing"), _("Computing fat filesystem bounds"));
my $resize_fat = eval { resize_fat::main->new($part->{device}, devices::make($part->{device})) };
my $min_win = $resize_fat->min_size;
- if (!$@ && $part->{size} > $min_linux + $min_freewin + $min_win && $o->ask_okcancel('',
+ if (!$@ && $part->{size} > $min_linux + $min_freewin + $min_win && $o->ask_okcancel('',
_("TODO"))) {
+ my $hd = $hds->[0];
my $oldsize = $part->{size};
- $hds->[0]{isDirty} = $hds->[0]{needKernelReread} = 1;
+ $hd->{isDirty} = $hd->{needKernelReread} = 1;
$part->{size} -= $min_linux;
- partition_table::adjustEnd($hds->[0], $part);
+ partition_table::adjustEnd($hd, $part);
+ partition_table::adjust_local_extended($hd, $part);
+ partition_table::adjust_main_extended($hd);
local *log::l = sub { $w->set(join(' ', @_)) };
eval { $resize_fat->resize($part->{size}) };
@@ -270,7 +273,7 @@ _("TODO"))) {
$part->{isFormatted} = 1;
eval { fsedit::auto_allocate($hds, $o->{partitions}) };
if (!$@) {
- partition_table::write($hds->[0]) unless $::testing;
+ partition_table::write($hd) unless $::testing;
return;
}
}
@@ -765,7 +768,7 @@ sub createXconf($$$) {
open F, ">$file" or die "can't create X configuration file $file";
print F <<END;
Section "Files"
- FontPath "/usr/X11R6/lib/X11/fonts"
+ FontPath "/usr/X11R6/lib/X11/fonts:unscaled,/usr/X11R6/lib/X11/fonts"
EndSection
Section "Keyboard"