summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2009-01-08 08:17:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2009-01-08 08:17:26 +0000
commitf617391f5e9c7755fc3bd54020a62aad761cb11c (patch)
tree475ece63a532f4771430fcf50aaa7eba94d469e6
parent30a7b3f5ae012b3ddb7ef67b4f2365a131093e55 (diff)
downloaddrakx-f617391f5e9c7755fc3bd54020a62aad761cb11c.tar
drakx-f617391f5e9c7755fc3bd54020a62aad761cb11c.tar.gz
drakx-f617391f5e9c7755fc3bd54020a62aad761cb11c.tar.bz2
drakx-f617391f5e9c7755fc3bd54020a62aad761cb11c.tar.xz
drakx-f617391f5e9c7755fc3bd54020a62aad761cb11c.zip
- disdrake
o --smb: cifs must be used instead of smbfs (#42483) (backported from trunk)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/mount.pm2
-rw-r--r--perl-install/fs/mount_options.pm6
-rw-r--r--perl-install/fs/remote/smb.pm2
4 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9ed34a126..d301b3e43 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o --smb: cifs must be used instead of smbfs (#42483)
+
Version 11.71.3 - 6 January 2009
- diskdrake:
diff --git a/perl-install/fs/mount.pm b/perl-install/fs/mount.pm
index 6dc312049..285848663 100644
--- a/perl-install/fs/mount.pm
+++ b/perl-install/fs/mount.pm
@@ -38,7 +38,7 @@ sub mount {
my @fs_modules = qw(ext3 ext4dev hfs jfs nfs ntfs romfs reiserfs ufs xfs vfat);
my @types = (qw(ext2 proc sysfs usbfs usbdevfs iso9660 devfs devpts auto ntfs-3g), @fs_modules);
- push @types, 'smb', 'smbfs', 'davfs2' if !$::isInstall;
+ push @types, 'smb', 'cifs', 'davfs2' if !$::isInstall;
if (!member($fs, @types)) {
log::l("skipping mounting $dev partition ($fs)");
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 6ac55584a..24820edb7 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -30,7 +30,7 @@ sub unpack {
vfat => [ qw(flush umask=0 umask=0022) ],
ntfs => [ qw(umask=0 umask=0022) ],
nfs => [ qw(rsize=8192 wsize=8192) ],
- smbfs => [ qw(username= password=) ],
+ cifs => [ qw(username= password=) ],
davfs2 => [ qw(username= password= uid= gid=) ],
ext4dev => [ qw(extents) ],
reiserfs => [ 'notail' ],
@@ -164,7 +164,7 @@ sub rationalize {
if ($part->{fs_type} ne 'reiserfs') {
$options->{notail} = 0;
}
- if (!fs::type::can_be_one_of_those_fs_types($part, 'vfat', 'smbfs', 'iso9660', 'udf')) {
+ if (!fs::type::can_be_one_of_those_fs_types($part, 'vfat', 'cifs', 'iso9660', 'udf')) {
delete $options->{'codepage='};
}
if (member($part->{mntpoint}, fs::type::directories_needed_to_boot())) {
@@ -216,7 +216,7 @@ sub set_default {
nosuid => 1, 'rsize=8192,wsize=8192' => 1, soft => 1,
});
}
- if ($part->{fs_type} eq 'smbfs') {
+ if ($part->{fs_type} eq 'cifs') {
add2hash($options, { 'username=' => '%' }) if !$options->{'credentials='};
}
if (fs::type::can_be_this_fs_type($part, 'vfat')) {
diff --git a/perl-install/fs/remote/smb.pm b/perl-install/fs/remote/smb.pm
index 7757eeb3f..f1452f5a7 100644
--- a/perl-install/fs/remote/smb.pm
+++ b/perl-install/fs/remote/smb.pm
@@ -12,7 +12,7 @@ our @ISA = 'fs::remote';
sub to_fstab_entry {
my ($class, $e) = @_;
- my $part = $class->to_fstab_entry_raw($e, 'smbfs');
+ my $part = $class->to_fstab_entry_raw($e, 'cifs');
if ($e->{server}{username}) {
my ($options, $unknown) = fs::mount_options::unpack($part);
$options->{"$_="} = $e->{server}{$_} foreach qw(username password domain);