summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-06 23:22:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-06 23:22:23 +0000
commit995ea591c5076d0a1f809f4b0c5d919db7510c88 (patch)
treee32a887a5e46515dbee32d4b4825f1b91c1ab61d /perl-install/install_steps_gtk.pm
parent21fbfdfead833c685b255edb3c3460198ce89877 (diff)
downloaddrakx-995ea591c5076d0a1f809f4b0c5d919db7510c88.tar
drakx-995ea591c5076d0a1f809f4b0c5d919db7510c88.tar.gz
drakx-995ea591c5076d0a1f809f4b0c5d919db7510c88.tar.bz2
drakx-995ea591c5076d0a1f809f4b0c5d919db7510c88.tar.xz
drakx-995ea591c5076d0a1f809f4b0c5d919db7510c88.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r--perl-install/install_steps_gtk.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 77ad2c850..0e613a620 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -240,6 +240,7 @@ When sure, press Ok."))) {
partition_table::adjust_main_extended($hd);
local *log::l = sub { $w->set(join(' ', @_)) };
+ my $b = before_leaving { close $resize_fat->{fd} };
eval { $resize_fat->resize($part->{size}) };
if ($@) {
$part->{size} = $oldsize;
@@ -269,14 +270,14 @@ When sure, press Ok."))) {
}
sub doPartitionDisksLnx4winDev {
- my ($o, $l) = @_;
- return if $::beginner;
- $o->ask_from_listf('', _("Which partition do you want to use to put Linux4Win?"), \&partition_table_raw::description, @$l);
+ my ($o, @l) = @_;
+ return $l[0] if $::beginner;
+ $o->ask_from_listf('', _("Which partition do you want to use to put Linux4Win?"), \&partition_table_raw::description, \@l);
}
sub doPartitionDisksLnx4winSize {
my ($o, $root_size, $swap_size, $max_root_size, $max_swap_size) = @_;
- return if $::beginner;
+ return 1 if $::beginner;
my $w = my_gtk->new('');
@@ -301,8 +302,7 @@ _("Choose the sizes"),
$w->main(sub {
$$root_size = $root_spin->get_value_as_int << 11;
$$swap_size = $swap_spin->get_value_as_int << 11;
- });
-
+ });
}
#------------------------------------------------------------------------------