From 1fbbc029d657a84e8cd3a42b35402bca11177498 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 24 Aug 2001 13:46:15 +0000
Subject: take care of using ram disk to remap mntpoint of hd installation
 partition.

---
 perl-install/fs.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 8fffe95f9..4daafd4db 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -95,7 +95,7 @@ sub merge_info_from_mtab {
     foreach (@l1, @l2) {
 	if ($::isInstall && $_->{mntpoint} eq '/tmp/hdimage') {
 	    $_->{real_mntpoint} = delete $_->{mntpoint};
-	    $_->{mntpoint} = "/mnt/hd"; #- remap for hd install.
+	    $_->{mntpoint} = common::usingRamdisk() && "/mnt/hd"; #- remap for hd install.
 	}
 	$_->{isMounted} = $_->{isFormatted} = 1;
 	delete $_->{options};
@@ -569,8 +569,12 @@ sub mount_part {
     #- root carrier's link can't be mounted
     loopback::carryRootCreateSymlink($part, $prefix);
 
-    if ($part->{isMounted} && $part->{real_mntpoint}) {
+    if ($part->{isMounted} && $part->{real_mntpoint} && $part->{mntpoint}) {
 	log::l("remounting partition on $prefix$part->{mntpoint} instead of $part->{real_mntpoint}");
+	if ($::isInstall) { #- ensure partition will not be busy.
+	    require install_any;
+	    install_any::getFile('XXX');
+	}
 	umount($part->{real_mntpoint});
 	rmdir $part->{real_mntpoint};
 	symlinkf "$prefix$part->{mntpoint}", $part->{real_mntpoint};
-- 
cgit v1.2.1