From 07cfbe49efa16539739dbb312ebe81ab2c81b87d Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 25 Sep 2000 16:22:18 +0000
Subject: *** empty log message ***

---
 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 5b13ea6a6..8a0f78ef3 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -54,7 +54,7 @@ sub check_mounted($) {
     open H, "/proc/swaps";
     foreach (<F>, <G>, <H>) {
 	foreach my $p (@$fstab) {
-	    /$p->{device}\s+([^\s]*)\s+/ and $p->{realMntpoint} = $1, $p->{isMounted} = $p->{isFormatted} = 1;
+	    /$p->{device}\s+([^\s]*)\s+/ and $p->{mntpoint} = $1, $p->{isMounted} = $p->{isFormatted} = 1, print STDERR "ok for $p->{mntpoint} with mounted=$p->{isMounted}\n";
 	}
     }
 }
@@ -335,9 +335,11 @@ sub write($$$$) {
     my ($prefix, $fstab, $manualFstab, $useSupermount) = @_;
     $fstab = [ @{$fstab||[]}, @{$manualFstab||[]} ];
 
-    log::l("resetting /etc/mtab");
-    local *F;
-    open F, "> $prefix/etc/mtab" or die "error resetting $prefix/etc/mtab";
+    unless ($::live) {
+	log::l("resetting /etc/mtab");
+	local *F;
+	open F, "> $prefix/etc/mtab" or die "error resetting $prefix/etc/mtab";
+    }
 
     my ($floppy) = detect_devices::floppies();
 
-- 
cgit v1.2.1