From 14f8743a2cac855531d9c6dadfdba1d66b59392d Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 16 Sep 2003 16:22:35 +0000
Subject: make sure / and /usr are formatted in recovery mode.

---
 perl-install/install_steps.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index e5c42fe73..103059cd7 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -221,7 +221,7 @@ sub doPartitionDisks {
 
 #------------------------------------------------------------------------------
 
-sub ask_mntpoint_s {
+sub ask_mntpoint_s {#-}}}
     my ($_o, $fstab) = @_;
 
     #- TODO: set the mntpoints
@@ -256,6 +256,7 @@ sub choosePartitionsToFormat($$) {
 	
 	add2hash_($_, { toFormat => $_->{notFormatted} });
         $_->{toFormatUnsure} = member($_->{mntpoint}, '/', '/usr');
+	$_->{toFormat} ||= $::recovery && delete $_->{toFormatUnsure};
 
 	if (!$_->{toFormat}) {
 	    my $t = fsedit::typeOfPart($_->{device});
-- 
cgit v1.2.1