From 69907ed1e861483d4063a1eec3662690681651a7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 27 Aug 1999 10:58:06 +0000
Subject: no_comment

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

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

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 860ab4ebd..4c7cbc469 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -143,11 +143,13 @@ sub mount_part($;$) {
     my ($part, $prefix) = @_;
     
     $part->{isMounted} and return;
-    $part->{mntpoint} or die "missing mount point";
     
-    isSwap($part) ?
-	swap::swapon($part->{device}) :
+    if (isSwap($part)) {
+	swap::swapon($part->{device});
+    } else {
+	$part->{mntpoint} or die "missing mount point";
 	mount(devices::make($part->{device}), ($prefix || '') . $part->{mntpoint}, type2fs($part->{type}), 0);
+    }
     $part->{isMounted} = $part->{isFormatted} = 1; # assume that if mount works, partition is formatted
 }
 
@@ -169,7 +171,7 @@ sub mount_all($;$) {
 
     # order mount by alphabetical ordre, that way / < /home < /home/httpd...
     foreach (sort { $a->{mntpoint} cmp $b->{mntpoint} } @$fstab) {
-	$_->{mntpoint} and mount_part($_, $prefix);
+	mount_part($_, $prefix) if ($_->{mntpoint} || isSwap($_));
     }
 }
 
-- 
cgit v1.2.1