From d758d6dbc2481a1c8ec01955d90d16890d6a2afc Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 20 Jan 2004 12:59:55 +0000
Subject: fix mount point /tmp/image for the cdrom in generated /etc/fstab

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

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index c1f6ec5d6..797b21836 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -168,10 +168,12 @@ sub merge_info_from_mtab {
 
     foreach (@l1, @l2) {
 	log::l("found mounted partition on $_->{device} with $_->{mntpoint}");
-	if ($::isInstall && $_->{mntpoint} eq '/tmp/hdimage') {
-	    log::l("found hdimage on $_->{device}");
+	if ($::isInstall && $_->{mntpoint} =~ m!/tmp/(image|hdimage)!) {
 	    $_->{real_mntpoint} = delete $_->{mntpoint};
-	    $_->{mntpoint} = common::usingRamdisk() && "/mnt/hd"; #- remap for hd install.
+	    if ($_->{real_mntpoint} eq '/tmp/hdimage') {
+		log::l("found hdimage on $_->{device}");
+		$_->{mntpoint} = common::usingRamdisk() && "/mnt/hd"; #- remap for hd install.
+	    }
 	}
 	$_->{isMounted} = $_->{isFormatted} = 1;
 	delete $_->{options};
-- 
cgit v1.2.1