summaryrefslogtreecommitdiffstats
path: root/perl-install/fs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-08 23:30:33 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-08 23:30:33 +0000
commit41e437726fab54cc7281426e745644177a9909af (patch)
treef3e10267cbeb726b66d74f1504325630c737299b /perl-install/fs.pm
parentac9bcd05a4fed48edd84d37121565d310eede77a (diff)
downloaddrakx-41e437726fab54cc7281426e745644177a9909af.tar
drakx-41e437726fab54cc7281426e745644177a9909af.tar.gz
drakx-41e437726fab54cc7281426e745644177a9909af.tar.bz2
drakx-41e437726fab54cc7281426e745644177a9909af.tar.xz
drakx-41e437726fab54cc7281426e745644177a9909af.zip
make loopback installs work again
Diffstat (limited to 'perl-install/fs.pm')
-rw-r--r--perl-install/fs.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 4257ad62c..35261956f 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -141,7 +141,7 @@ sub write_fstab {
$_->{device} eq 'none' || member($_->{type}, qw(nfs smbfs)) ?
$_->{device} :
isLoopback($_) ?
- ($_->{mntpoint} eq '/' ? "/initrd/loopfs$_->{loopback_file}" : $_->{device}) :
+ ($_->{mntpoint} eq '/' ? "/initrd/loopfs" : "$_->{loopback_device}{mntpoint}") . $_->{loopback_file} :
do {
my $dir = $_->{device} =~ m|^/| ? '' : '/dev/';
eval { devices::make("$prefix$dir$_->{device}") };
@@ -354,7 +354,7 @@ sub set_default_options {
if (isThisFs('reiserfs', $part)) {
$options->{notail} = 1;
}
- if (isLoopback($_) && !isSwap($_)) { #- no need for loop option for swap files
+ if (isLoopback($part) && !isSwap($part)) { #- no need for loop option for swap files
$options->{loop} = 1;
}
@@ -640,7 +640,7 @@ sub mount_part {
if (isSwap($part)) {
swap::swapon($part->{device});
} else {
- $part->{mntpoint} or die "missing mount point";
+ $part->{mntpoint} or die "missing mount point for partition $part->{device}";
my $dev = $part->{device};
my $mntpoint = ($prefix || '') . $part->{mntpoint};