summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2009-01-09 08:51:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2009-01-09 08:51:15 +0000
commit03ee22ff13610ec9bd121f691ddf7639be5fa16d (patch)
tree968963d73582b12d5c40515afb4df505bf2bb87c /perl-install
parent8d4c05f63ca1dc42fdbab067adfdf047c1a06fb0 (diff)
downloaddrakx-03ee22ff13610ec9bd121f691ddf7639be5fa16d.tar
drakx-03ee22ff13610ec9bd121f691ddf7639be5fa16d.tar.gz
drakx-03ee22ff13610ec9bd121f691ddf7639be5fa16d.tar.bz2
drakx-03ee22ff13610ec9bd121f691ddf7639be5fa16d.tar.xz
drakx-03ee22ff13610ec9bd121f691ddf7639be5fa16d.zip
hum, the switch to cifs suggested in #42483 was only partially done, comment
#11 of the #42483 completes the fix. this fixes: - diskdrake: o --smb: cifs must be used instead of smbfs (#42483)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs.pm9
1 files changed, 3 insertions, 6 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 2ecc946e2..d95890cb3 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -69,9 +69,6 @@ sub read_fstab {
1;
}
} split(',', $options));
- } elsif ($fs_type eq 'smb') {
- # prefering type "smbfs" over "smb"
- $fs_type = 'smbfs';
}
s/\\040/ /g foreach $mntpoint, $dev, $options;
@@ -150,7 +147,7 @@ sub add2all_hds {
foreach (@l) {
my $s =
$_->{fs_type} eq 'nfs' ? 'nfss' :
- $_->{fs_type} eq 'smbfs' ? 'smbs' :
+ $_->{fs_type} eq 'cifs' ? 'smbs' :
$_->{fs_type} eq 'davfs2' ? 'davs' :
isTrueLocalFS($_) || isSwap($_) || isOtherAvailableFS($_) ? '' :
'special';
@@ -246,7 +243,7 @@ sub prepare_write_fstab {
my $options = $_->{options} || 'defaults';
- if ($_->{fs_type} eq 'smbfs' && $options =~ /password=/ && !$b_keep_credentials) {
+ if ($_->{fs_type} eq 'cifs' && $options =~ /password=/ && !$b_keep_credentials) {
require fs::remote::smb;
if (my ($opts, $smb_credentials) = fs::remote::smb::fstab_entry_to_credentials($_)) {
$options = $opts;
@@ -335,7 +332,7 @@ sub get_raw_hds {
my @fstab = read_fstab($prefix, '/etc/fstab', 'keep_default');
$all_hds->{nfss} = [ grep { $_->{fs_type} eq 'nfs' } @fstab ];
- $all_hds->{smbs} = [ grep { $_->{fs_type} eq 'smbfs' } @fstab ];
+ $all_hds->{smbs} = [ grep { $_->{fs_type} eq 'cifs' } @fstab ];
$all_hds->{davs} = [ grep { $_->{fs_type} eq 'davfs2' } @fstab ];
$all_hds->{special} = [
(grep { $_->{fs_type} eq 'tmpfs' } @fstab),