From fe83432531821870b3aacb595f26ff8cb6ba67e7 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 5 Jul 2005 06:45:29 +0000 Subject: don't suggest to format partition if we need to reboot --- perl-install/diskdrake/interactive.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'perl-install/diskdrake') diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 285b74d30..917d6f75f 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -274,11 +274,6 @@ sub Done { $::expert or die; $in->ask_okcancel('', [ formatError($err), N("Continue anyway?") ]) or return; } - if (my $part = find { $_->{mntpoint} && !maybeFormatted($_) } fs::get::fstab($all_hds)) { - $in->ask_okcancel('', N("You should format partition %s. -Otherwise no entry for mount point %s will be written in fstab. -Quit anyway?", $part->{device}, $part->{mntpoint})) or return if $::isStandalone; - } foreach (@{$all_hds->{hds}}) { if (!write_partitions($in, $_, 'skip_check_rebootNeeded')) { return if !$::isStandalone; @@ -298,6 +293,11 @@ Quit anyway?", $part->{device}, $part->{mntpoint})) or return if $::isStandalone tell_wm_and_reboot(); } } + if (my $part = find { $_->{mntpoint} && !maybeFormatted($_) } fs::get::fstab($all_hds)) { + $in->ask_okcancel('', N("You should format partition %s. +Otherwise no entry for mount point %s will be written in fstab. +Quit anyway?", $part->{device}, $part->{mntpoint})) or return if $::isStandalone; + } 1; } -- cgit v1.2.1