summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-08-24 13:46:15 +0000
committerFrancois Pons <fpons@mandriva.com>2001-08-24 13:46:15 +0000
commit1fbbc029d657a84e8cd3a42b35402bca11177498 (patch)
treece2a6f71012b735d4a5e44a56155728585b919e4
parentf514229af26da10b7469d2e197cbca3db151edb4 (diff)
downloaddrakx-backup-do-not-use-1fbbc029d657a84e8cd3a42b35402bca11177498.tar
drakx-backup-do-not-use-1fbbc029d657a84e8cd3a42b35402bca11177498.tar.gz
drakx-backup-do-not-use-1fbbc029d657a84e8cd3a42b35402bca11177498.tar.bz2
drakx-backup-do-not-use-1fbbc029d657a84e8cd3a42b35402bca11177498.tar.xz
drakx-backup-do-not-use-1fbbc029d657a84e8cd3a42b35402bca11177498.zip
take care of using ram disk to remap mntpoint of hd installation partition.
-rw-r--r--perl-install/fs.pm8
1 files changed, 6 insertions, 2 deletions
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};