diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-08-10 02:22:37 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-08-10 02:22:37 +0000 |
| commit | 9f4882d7643560f35b8626925d2fcc9c680cfaa2 (patch) | |
| tree | 35243cd4c411b1150b798be4e9209fac090e65a3 /perl-install | |
| parent | db3f26326d9447b21992bbdde229976cac67f626 (diff) | |
| download | drakx-9f4882d7643560f35b8626925d2fcc9c680cfaa2.tar drakx-9f4882d7643560f35b8626925d2fcc9c680cfaa2.tar.gz drakx-9f4882d7643560f35b8626925d2fcc9c680cfaa2.tar.bz2 drakx-9f4882d7643560f35b8626925d2fcc9c680cfaa2.tar.xz drakx-9f4882d7643560f35b8626925d2fcc9c680cfaa2.zip | |
remove encryption=xxx and encrypted option before passing them to mount() since we take care of the encrypted loopback ourself (bugzilla #17142)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/fs/mount.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm index f75284e1d..0d59de1cc 100644 --- a/perl-install/fs/mount.pm +++ b/perl-install/fs/mount.pm @@ -145,8 +145,10 @@ sub part { $part->{mntpoint} or die "missing mount point for partition $part->{device}"; my $mntpoint = fs::get::mntpoint_prefixed($part); + my $options = $part->{options}; if (isLoopback($part) || $part->{encrypt_key}) { set_loop($part); + $options = join(',', grep { !/^(encryption=|encrypted$)/ } split(',', $options)); #- we take care of this, don't let it mount see it } elsif ($part->{options} =~ /encrypted/) { log::l("skip mounting $part->{device} since we do not have the encrypt_key"); return; @@ -154,7 +156,7 @@ sub part { $mntpoint = "/initrd/loopfs"; } my $dev = $part->{real_device} || fs::wild_device::from_part('', $part); - mount($dev, $mntpoint, $part->{fs_type}, $b_rdonly, $part->{options}, $o_wait_message); + mount($dev, $mntpoint, $part->{fs_type}, $b_rdonly, $options, $o_wait_message); } } $part->{isMounted} = 1; |