summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-05 10:04:46 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-05 10:04:46 +0000
commit27779dd88a9699b98070fee12a355503bd95ade3 (patch)
treeec95227cb5f368afb6b233b78ba7d29eef2ebdb3
parent1cdb08a708304ee9511f12ccbd403f6147cb9a7f (diff)
downloaddrakx-backup-do-not-use-27779dd88a9699b98070fee12a355503bd95ade3.tar
drakx-backup-do-not-use-27779dd88a9699b98070fee12a355503bd95ade3.tar.gz
drakx-backup-do-not-use-27779dd88a9699b98070fee12a355503bd95ade3.tar.bz2
drakx-backup-do-not-use-27779dd88a9699b98070fee12a355503bd95ade3.tar.xz
drakx-backup-do-not-use-27779dd88a9699b98070fee12a355503bd95ade3.zip
support setting /tmp/hdimage in /etc/fstab even if memory is low (not using ramdisk).
-rw-r--r--perl-install/fs.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index b8f33b7ed..962e77ab0 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -148,8 +148,9 @@ sub write_fstab {
"$dir$_->{device}";
};
- mkdir("$prefix/$_->{mntpoint}", 0755);
+ mkdir("$prefix/" . ($_->{mntpoint} || $_->{real_mntpoint}), 0755);
my $mntpoint = loopback::carryRootLoopback($_) ? '/initrd/loopfs' : $_->{mntpoint};
+ $mntpoint ||= ${{ '/tmp/hdimage' => '/mnt/hd' }}{$_->{real_mntpoint}}; #- convert for inaccessible partition at install.
my ($freq, $passno) =
exists $_->{freq} ?
@@ -178,7 +179,7 @@ sub write_fstab {
} else {
()
}
- } grep { $_->{device} && $_->{mntpoint} && $_->{type} } (@l1, @l2);
+ } grep { $_->{device} && ($_->{mntpoint} || $_->{real_mntpoint}) && $_->{type} } (@l1, @l2);
log::l("writing $prefix/etc/fstab");
output("$prefix/etc/fstab", map { join(' ', @$_) . "\n" } sort { $a->[1] cmp $b->[1] } @l);