summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-07-05 06:45:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-07-05 06:45:29 +0000
commitfe83432531821870b3aacb595f26ff8cb6ba67e7 (patch)
tree424c11e16120998cbb36084b7d60793f467b99b8 /perl-install
parent547ffffdd038af955ca09588b06eb1e95f4d0879 (diff)
downloaddrakx-backup-do-not-use-fe83432531821870b3aacb595f26ff8cb6ba67e7.tar
drakx-backup-do-not-use-fe83432531821870b3aacb595f26ff8cb6ba67e7.tar.gz
drakx-backup-do-not-use-fe83432531821870b3aacb595f26ff8cb6ba67e7.tar.bz2
drakx-backup-do-not-use-fe83432531821870b3aacb595f26ff8cb6ba67e7.tar.xz
drakx-backup-do-not-use-fe83432531821870b3aacb595f26ff8cb6ba67e7.zip
don't suggest to format partition if we need to reboot
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/diskdrake/interactive.pm10
1 files changed, 5 insertions, 5 deletions
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;
}