diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-04-17 12:06:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-04-17 12:06:24 +0000 |
| commit | 1323b1a13e9d140718128c26ab090e4ee84ff53a (patch) | |
| tree | 85b0530fcfb896d4ce8256129d30ccd6ed1173d0 /perl-install/fs.pm | |
| parent | 4781e491c32fdfe0dbe3cf97a8aca90040a9406b (diff) | |
| download | drakx-1323b1a13e9d140718128c26ab090e4ee84ff53a.tar drakx-1323b1a13e9d140718128c26ab090e4ee84ff53a.tar.gz drakx-1323b1a13e9d140718128c26ab090e4ee84ff53a.tar.bz2 drakx-1323b1a13e9d140718128c26ab090e4ee84ff53a.tar.xz drakx-1323b1a13e9d140718128c26ab090e4ee84ff53a.zip | |
another perl_checker optional parameter compliance
Diffstat (limited to 'perl-install/fs.pm')
| -rw-r--r-- | perl-install/fs.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 9f3938577..40ee13b21 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -203,8 +203,8 @@ sub get_info_from_fstab { } sub prepare_write_fstab { - my ($fstab, $prefix, $keep_smb_credentials) = @_; - $prefix ||= ''; + my ($fstab, $o_prefix, $b_keep_smb_credentials) = @_; + $o_prefix ||= ''; my %new; my @smb_credentials; @@ -212,10 +212,10 @@ sub prepare_write_fstab { my $device = isLoopback($_) ? ($_->{mntpoint} eq '/' ? "/initrd/loopfs" : $_->{loopback_device}{mntpoint}) . $_->{loopback_file} : - part2device($prefix, $_->{device}, $_->{type}); + part2device($o_prefix, $_->{device}, $_->{type}); my $real_mntpoint = $_->{mntpoint} || ${{ '/tmp/hdimage' => '/mnt/hd' }}{$_->{real_mntpoint}}; - mkdir_p("$prefix$real_mntpoint") if $real_mntpoint =~ m|^/|; + mkdir_p("$o_prefix$real_mntpoint") if $real_mntpoint =~ m|^/|; my $mntpoint = loopback::carryRootLoopback($_) ? '/initrd/loopfs' : $real_mntpoint; my ($freq, $passno) = @@ -232,7 +232,7 @@ sub prepare_write_fstab { my $options = $_->{options}; - if (isThisFs('smbfs', $_) && $options =~ /password=/ && !$keep_smb_credentials) { + if (isThisFs('smbfs', $_) && $options =~ /password=/ && !$b_keep_smb_credentials) { require network::smb; if (my ($opts, $smb_credentials) = network::smb::fstab_entry_to_credentials($_)) { $options = $opts; |