From fd6b89e3d9cb165829a25cd196b5340104a4e440 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 5 Jan 2000 20:55:20 +0000
Subject: no_comment

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

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 20cbf3798..5493d3dbe 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -164,12 +164,12 @@ sub umount_part($;$) {
     $part->{isMounted} = 0;
 }
 
-sub mount_all($;$) {
-    my ($fstab, $prefix) = @_;
+sub mount_all($;$$) {
+    my ($fstab, $prefix, $hd_dev) = @_; #- hd_dev is the device used for hd install
 
     log::l("mounting all filesystems");
 
-    my ($hd_dev) = cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/hdimage| unless $::isStandalone;
+    $hd_dev ||= cat_("/proc/mounts") =~ m|/tmp/(\S+)\s+/tmp/hdimage| unless $::isStandalone;
 
     #- order mount by alphabetical ordre, that way / < /home < /home/httpd...
     foreach (grep { $_->{mntpoint} } sort { ($a->{mntpoint} || '') cmp ($b->{mntpoint} || '') } @$fstab) {
-- 
cgit v1.2.1