summaryrefslogtreecommitdiffstats
path: root/perl-install/fs.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-09-25 16:22:18 +0000
committerFrancois Pons <fpons@mandriva.com>2000-09-25 16:22:18 +0000
commit07cfbe49efa16539739dbb312ebe81ab2c81b87d (patch)
treecbad47b03620d1a267663791f7ef905c61478102 /perl-install/fs.pm
parent8e690ad57bb02fe2bd838aa60b80774149971047 (diff)
downloaddrakx-backup-do-not-use-07cfbe49efa16539739dbb312ebe81ab2c81b87d.tar
drakx-backup-do-not-use-07cfbe49efa16539739dbb312ebe81ab2c81b87d.tar.gz
drakx-backup-do-not-use-07cfbe49efa16539739dbb312ebe81ab2c81b87d.tar.bz2
drakx-backup-do-not-use-07cfbe49efa16539739dbb312ebe81ab2c81b87d.tar.xz
drakx-backup-do-not-use-07cfbe49efa16539739dbb312ebe81ab2c81b87d.zip
*** empty log message ***
Diffstat (limited to 'perl-install/fs.pm')
-rw-r--r--perl-install/fs.pm10
1 files changed, 6 insertions, 4 deletions
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();