From 2bca42f6a4fec80c51e2ecbddb0005c08cd0d36e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 9 Jan 2009 08:57:15 +0000
Subject: releasing 11.71.5 which replaces 11.71.4

the switch to cifs suggested in #42483 was only partially done, comment #11 of
the #42483 completes the fix.

this (should) completly fixes:

- diskdrake:
  o --smb: cifs must be used instead of smbfs (#42483)
---
 perl-install/Makefile.config | 2 +-
 perl-install/NEWS            | 6 ++----
 perl-install/fs.pm           | 9 +++------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 2222fe612..843fc671a 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
 # -*- Makefile -*-
-VERSION:=11.71.4
+VERSION:=11.71.5
 
 SUDO        = sudo
 TMPDIR      = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 05a94791c..a175f050e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,9 +1,7 @@
-- diskdrake:
-  o lookup for Samba master browsers too
-
-Version 11.71.4 - 8 January 2009
+Version 11.71.5 - 9 January 2009
 
 - diskdrake:
+  o lookup for Samba master browsers too
   o --smb: cifs must be used instead of smbfs (#42483)
 
 Version 11.71.3 - 6 January 2009
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),
-- 
cgit v1.2.1