From 640255572c30658ad75a7ed7948617dd56fdeaa4 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 10 Jul 2000 16:33:21 +0000
Subject: no_comment

---
 perl-install/fs.pm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 2eb7c4bf9..9d3c38049 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -232,6 +232,14 @@ sub umount($) {
 sub mount_part($;$$) {
     my ($part, $prefix, $rdonly) = @_;
 
+    if ($part->{realMntpoint} eq "/tmp/hdimage") {
+	my $dir = "$prefix$part->{mntpoint}";
+	$dir =~ s|/+$||;
+	log::l("special hd case ($dir)");
+	rmdir $dir;
+	symlink "/tmp/hdimage", $dir;
+	return;
+    }
     #- root carrier's link can't be mounted
     loopback::carryRootCreateSymlink($part, $prefix);
 
@@ -277,23 +285,13 @@ sub umount_part($;$) {
 }
 
 sub mount_all($;$$) {
-    my ($fstab, $prefix, $hd_dev) = @_; #- hd_dev is the device used for hd install
+    my ($fstab, $prefix) = @_;
 
     log::l("mounting all filesystems");
 
-    $hd_dev ||= cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/hdimage| unless $::isStandalone;
-
     #- order mount by alphabetical ordre, that way / < /home < /home/httpd...
     foreach (sort { $a->{mntpoint} cmp $b->{mntpoint} } grep { $_->{mntpoint} } @$fstab) {
-	if ($hd_dev && $_->{device} eq $hd_dev) {
-	    my $dir = "$prefix$_->{mntpoint}";
-	    $dir =~ s|/+$||;
-	    log::l("special hd case ($dir)");
-	    rmdir $dir;
-	    symlink "/tmp/hdimage", $dir;
-	} else {
-	  mount_part($_, $prefix);
-      }
+	mount_part($_, $prefix);
     }
 }
 
-- 
cgit v1.2.1